diff options
| author | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2016-09-23 09:58:33 +0200 |
|---|---|---|
| committer | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2016-09-23 09:58:33 +0200 |
| commit | 430f53af7d2d8b9a2bda1986bd6ecb8eb7630b5d (patch) | |
| tree | b7618c81d8844c387b78861ee96af91109a633fe /scripts/buildsystems | |
| parent | 31935aa0fd142cbb4e0db1a62ba1483294b740f8 (diff) | |
| parent | 5b89712df01c96242ced20c38f0fa27631c3f4e3 (diff) | |
| download | vcpkg-430f53af7d2d8b9a2bda1986bd6ecb8eb7630b5d.tar.gz vcpkg-430f53af7d2d8b9a2bda1986bd6ecb8eb7630b5d.zip | |
Merge branch 'master' into default_triplet
# Conflicts:
# toolsrc/include/vcpkg_cmd_arguments.h
# toolsrc/src/commands_installation.cpp
# toolsrc/src/vcpkg_cmd_arguments.cpp
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 26cc8a57b..262d52092 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -27,11 +27,11 @@ if(NOT VCPKG_TOOLCHAIN) if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) list(APPEND CMAKE_PREFIX_PATH - ${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET}/debug + ${CMAKE_CURRENT_LIST_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET}/debug ) endif() list(APPEND CMAKE_PREFIX_PATH - ${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET} + ${CMAKE_CURRENT_LIST_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET} ) include_directories(${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET}/include) |