diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-28 17:18:07 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-28 17:18:07 -0700 |
| commit | a9a8772ad470280bf63d81896c3019eac74bd21a (patch) | |
| tree | e49d4eb9c611ef790131a5ac7ff3df959187f7fa /scripts | |
| parent | b36980e682609696506062b6ca827d4944bf0eed (diff) | |
| download | vcpkg-a9a8772ad470280bf63d81896c3019eac74bd21a.tar.gz vcpkg-a9a8772ad470280bf63d81896c3019eac74bd21a.zip | |
[vcpkg-configure-cmake] Rely on toolchain to provide CMAKE_PREFIX_PATH
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 36664e7bc..14e50d5bf 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -100,7 +100,6 @@ function(vcpkg_configure_cmake) COMMAND ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE} -G ${GENERATOR} -DCMAKE_BUILD_TYPE=Release - -DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR} -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel LOGNAME config-${TARGET_TRIPLET}-rel @@ -113,7 +112,6 @@ function(vcpkg_configure_cmake) COMMAND ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG} -G ${GENERATOR} -DCMAKE_BUILD_TYPE=Debug - -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 LOGNAME config-${TARGET_TRIPLET}-dbg |