Merge branch 'bc/require-c99'

[thirdparty/git.git] / contrib / buildsystems / CMakeLists.txt

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 0945a8322368421a33de0b2cd792bacbaa0d0458..be67b4dab0c753372061b6f5e2a7f59c7c23409a 100644 (file)
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -624,6 +624,13 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/config-list.h)
                        OUTPUT_FILE ${CMAKE_BINARY_DIR}/config-list.h)
 endif()
 
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/hook-list.h)
+       message("Generating hook-list.h")
+       execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-hooklist.sh
+                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                       OUTPUT_FILE ${CMAKE_BINARY_DIR}/hook-list.h)
+endif()
+
 include_directories(${CMAKE_BINARY_DIR})
 
 #build
@@ -774,7 +781,6 @@ foreach(script ${git_shell_scripts})
        string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}")
        string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}")
        string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}")
-       string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}")
        string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
        file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
 endforeach()