]> git.ipfire.org Git - thirdparty/git.git/commitdiff
cmake: ensure that the `vcpkg` packages are found on Windows
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 28 Sep 2020 21:09:08 +0000 (21:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Sep 2020 22:11:39 +0000 (15:11 -0700)
On Windows, we use the `vcpkg` project to manage the dependencies, via
`compat/vcbuild/`. Let's make sure that these dependencies are found by
default.

This is needed because we are about to recommend loading the Git
worktree as a folder into Visual Studio, relying on the automatic CMake
support (which would make it relatively cumbersome to adjust the search
path used by CMake manually).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/buildsystems/CMakeLists.txt

index 1847a6fd581544cd744403d6ba679d55f57640d4..12268f61bab2072f323915cd21c1641f1719190a 100644 (file)
@@ -40,6 +40,13 @@ cmake_minimum_required(VERSION 3.14)
 
 #set the source directory to root of git
 set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
+if(WIN32)
+       set(VCPKG_DIR "${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg")
+       list(APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR}/installed/x64-windows")
+
+       # In the vcpkg edition, we need this to be able to link to libcurl
+       set(CURL_NO_CURL_CMAKE ON)
+endif()
 
 find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin")
 if(NOT SH_EXE)