diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-20 08:47:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 08:47:26 -0700 |
| commit | 4da95d667c8600c80b4b5731631ebb7bcbc91f1b (patch) | |
| tree | faa447f7b1beb0d784bbd353a8aa6b449ae71ba2 /scripts | |
| parent | 463a67897c8249d996f7b41cabb9ac1fb5a35af9 (diff) | |
| download | vcpkg-4da95d667c8600c80b4b5731631ebb7bcbc91f1b.tar.gz vcpkg-4da95d667c8600c80b4b5731631ebb7bcbc91f1b.zip | |
[vcpkg]Port toolchains (#7687)
* checkpoint commit
* Only set VCPKG_ENV_OVERRIDES_FILE if it exists
* First pass at working port-toolchain
* Update VERSION.txt
* Return rvalue
* Fix compilation error
* Some fixes are requested by @ubsan
* Fix another compilation error
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get_triplet_environment.cmake | 4 | ||||
| -rw-r--r-- | scripts/ports.cmake | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake index 0457cee9b..3b0b9fbef 100644 --- a/scripts/get_triplet_environment.cmake +++ b/scripts/get_triplet_environment.cmake @@ -1,6 +1,6 @@ include(${CMAKE_TRIPLET_FILE}) -if (DEFINED CMAKE_ENV_OVERRIDES_FILE) - include(${CMAKE_ENV_OVERRIDES_FILE} OPTIONAL) +if (DEFINED VCPKG_ENV_OVERRIDES_FILE) + include(${VCPKG_ENV_OVERRIDES_FILE}) endif() # GUID used as a flag - "cut here line" diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 86b2719d5..7130825e2 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -67,7 +67,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) |