diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-03 16:52:36 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-10-03 16:52:56 -0700 |
| commit | fb6ec0bb8273c81ae7ae55f8528a7efe7cb21377 (patch) | |
| tree | 0e4885f2cfb72906e4c1cba7e8e8d6ab9ce07332 | |
| parent | e03e617f069471c34e90b1a84e256c1607252f04 (diff) | |
| download | vcpkg-fb6ec0bb8273c81ae7ae55f8528a7efe7cb21377.tar.gz vcpkg-fb6ec0bb8273c81ae7ae55f8528a7efe7cb21377.zip | |
[vcpkg] Fix UWP regression introduced with ac2e248e8f. Fixes #111
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index aa85c8ff4..3938d8d79 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -29,7 +29,7 @@ function(vcpkg_configure_cmake) -G ${GENERATOR} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TRIPLET_FILE} -DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR} -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel @@ -44,7 +44,7 @@ function(vcpkg_configure_cmake) -G ${GENERATOR} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TRIPLET_FILE} -DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/debug\\\\\\\;${CURRENT_INSTALLED_DIR} -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg |