]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mr/cmake'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2021 23:52:51 +0000 (16:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2021 23:52:51 +0000 (16:52 -0700)
CMake update.

* mr/cmake:
  cmake: add warning for ignored MSGFMT_EXE
  cmake: create compile_commands.json by default
  cmake: add knob to disable vcpkg

1  2 
contrib/buildsystems/CMakeLists.txt

index a87841340e6a27f0f482a3e17521e3e03de4074d,675e2ae6fb8bb3c84ec96d75b18e464be96a5086..3dc7ffcd98bbeb1ac566c93762852b8984da7bfa
@@@ -981,8 -975,7 +1000,8 @@@ file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUI
  file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
  file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
  file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")
- if(WIN32)
 +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SUPPORTS_SIMPLE_IPC='${SUPPORTS_SIMPLE_IPC}'\n")
+ if(USE_VCPKG)
        file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
  endif()