diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-21 01:48:40 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-21 01:48:52 -0700 |
| commit | 8dc2699e5dc77bf04a2d3455f05a31cb6b0f7c86 (patch) | |
| tree | 2be2840f98c2255cc6b4a6bed1b1aacd3dd551dd /scripts | |
| parent | 38233af9a2acb332c9f8edfab62dafcb4b08ac39 (diff) | |
| download | vcpkg-8dc2699e5dc77bf04a2d3455f05a31cb6b0f7c86.tar.gz vcpkg-8dc2699e5dc77bf04a2d3455f05a31cb6b0f7c86.zip | |
[vcpkg-configure-cmake] Use toolchain in internal builds.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 10 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e7b2b20db..0cd9e0135 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -59,6 +59,16 @@ if(NOT VCPKG_TOOLCHAIN) set(Boost_COMPILER "-vc140") + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) + set(CMAKE_SYSTEM_IGNORE_PATH + "${_programfiles}/OpenSSL" + "${_programfiles}/OpenSSL-Win32" + "${_programfiles}/OpenSSL-Win64" + "C:/OpenSSL/" + "C:/OpenSSL-Win32/" + "C:/OpenSSL-Win64/" + ) + set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools) option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index e3ca3adca..36664e7bc 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -64,10 +64,11 @@ function(vcpkg_configure_cmake) "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" - "-DBoost_COMPILER=-vc140" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" - "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TRIPLET_FILE}" + "-DVCPKG_APPLOCAL_DEPS=OFF" + "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/buildsystems/vcpkg.cmake" + "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" ) if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic) list(APPEND _csc_OPTIONS_DEBUG |