From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jul 2021 23:52:51 +0000 (-0700)
Subject: Merge branch 'mr/cmake'
X-Git-Tag: v2.33.0-rc0~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3c0b71f9ad82483b37869c3b0fb88e3efb4a308;p=thirdparty%2Fgit.git

Merge branch 'mr/cmake'

CMake update.

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

c3c0b71f9ad82483b37869c3b0fb88e3efb4a308
diff --cc contrib/buildsystems/CMakeLists.txt
index a87841340e,675e2ae6fb..3dc7ffcd98
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@@ -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")
 +file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SUPPORTS_SIMPLE_IPC='${SUPPORTS_SIMPLE_IPC}'\n")
- if(WIN32)
+ if(USE_VCPKG)
  	file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
  endif()