git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-17 22:19:19 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

cmake(install): include vcpkg dlls

Browse Source 
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
This commit is contained in:
Dennis Ameling
2021-01-08 23:49:21 +01:00
committed by Johannes Schindelin
parent 5c76a529a9
commit ecf7ee3cd5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/buildsystems/CMakeLists.txt
View File

@@ -58,6 +58,10 @@ if(WIN32)
# In the vcpkg edition, we need this to be able to link to libcurl # In the vcpkg edition, we need this to be able to link to libcurl
set(CURL_NO_CURL_CMAKE ON) set(CURL_NO_CURL_CMAKE ON)
# Copy the necessary vcpkg DLLs (like iconv) to the install dir
set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
endif() endif()
find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin") find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin")