diff options
| author | martin-s <webmaster@macside.net> | 2019-08-22 21:55:50 +0000 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-22 14:55:50 -0700 |
| commit | 95f9df71343c9c688336a0ac8489ae20ffc035e2 (patch) | |
| tree | 1efebdc7aeab11bd0b8ef68392d458c77a75a4ba /scripts | |
| parent | daeba9e58bcffb7d7927dbb346a01351821116b8 (diff) | |
| download | vcpkg-95f9df71343c9c688336a0ac8489ae20ffc035e2.tar.gz vcpkg-95f9df71343c9c688336a0ac8489ae20ffc035e2.zip | |
- Fixed ports script. (#7793)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ports.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 7130825e2..056485568 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -6,8 +6,9 @@ macro(debug_message) endif() endmacro() -#Detect .vcpkg-root to figure VCPKG_ROOT_DIR -SET(VCPKG_ROOT_DIR_CANDIDATE ${CMAKE_CURRENT_LIST_DIR}) +#Detect .vcpkg-root to figure VCPKG_ROOT_DIR, starting from triplet folder. +get_filename_component(TARGET_TRIPLET_DIR ${TARGET_TRIPLET_FILE} DIRECTORY) +SET(VCPKG_ROOT_DIR_CANDIDATE ${TARGET_TRIPLET_DIR}) while(IS_DIRECTORY ${VCPKG_ROOT_DIR_CANDIDATE} AND NOT EXISTS "${VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root") get_filename_component(VCPKG_ROOT_DIR_TEMP ${VCPKG_ROOT_DIR_CANDIDATE} DIRECTORY) if (VCPKG_ROOT_DIR_TEMP STREQUAL VCPKG_ROOT_DIR_CANDIDATE) # If unchanged, we have reached the root of the drive @@ -19,7 +20,7 @@ endwhile() set(VCPKG_ROOT_DIR ${VCPKG_ROOT_DIR_CANDIDATE}) -list(APPEND CMAKE_MODULE_PATH ${VCPKG_ROOT_DIR}/scripts/cmake) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) set(CURRENT_INSTALLED_DIR ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET} CACHE PATH "Location to install final packages") set(DOWNLOADS ${VCPKG_ROOT_DIR}/downloads CACHE PATH "Location to download sources and tools") set(PACKAGES_DIR ${VCPKG_ROOT_DIR}/packages CACHE PATH "Location to store package images") |