diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-08-23 11:18:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 11:18:34 -0700 |
| commit | bd4678610b221ae6cd4911295e84808ea7924cc6 (patch) | |
| tree | 1e51033d924c41cd147f33665990b75fe19ff4b7 /scripts/ports.cmake | |
| parent | 1245f1dbfc383d33b2fa576f010644de9687280e (diff) | |
| parent | cf447c050c734fc71e5254ea9e05e1bc4a9d208d (diff) | |
| download | vcpkg-bd4678610b221ae6cd4911295e84808ea7924cc6.tar.gz vcpkg-bd4678610b221ae6cd4911295e84808ea7924cc6.zip | |
Merge branch 'master' into multi_line_depends
Diffstat (limited to 'scripts/ports.cmake')
| -rw-r--r-- | scripts/ports.cmake | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 86b2719d5..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") @@ -67,7 +68,16 @@ if(CMD MATCHES "^BUILD$") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) include(${CMAKE_TRIPLET_FILE}) - include(${ENV_OVERRIDES_FILE} OPTIONAL) + + if (DEFINED VCPKG_ENV_OVERRIDES_FILE) + include(${VCPKG_ENV_OVERRIDES_FILE}) + endif() + + if (DEFINED VCPKG_PORT_TOOLCHAINS) + foreach(VCPKG_PORT_TOOLCHAIN ${VCPKG_PORT_TOOLCHAINS}) + include(${VCPKG_PORT_TOOLCHAIN}) + endforeach() + endif() set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE}) include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake) |