diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-12-07 21:40:36 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-12-07 21:40:36 -0800 |
| commit | 31b713ca1fe74f784f01cdc6ed0cfdaf4a5fcaf7 (patch) | |
| tree | 8c0fff779c00ebfd28462660415740cd1696239d | |
| parent | 97b0479db07f4c0e07092ccc21297d7fa181ed55 (diff) | |
| download | vcpkg-31b713ca1fe74f784f01cdc6ed0cfdaf4a5fcaf7.tar.gz vcpkg-31b713ca1fe74f784f01cdc6ed0cfdaf4a5fcaf7.zip | |
[vcpkg] Remove all instances of TRIPLET_SYSTEM_NAME; use VCPKG_CMAKE_SYSTEM_NAME instead.
| -rw-r--r-- | ports/boost/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/sdl2/portfile.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 6 | ||||
| -rw-r--r-- | scripts/ports.cmake | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index f9d70554a..fcf60402b 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -55,7 +55,7 @@ endif() if(TRIPLET_SYSTEM_ARCH MATCHES "x64") list(APPEND B2_OPTIONS address-model=64) endif() -if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") +if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") list(APPEND B2_OPTIONS windows-api=store) set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}) endif() diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 6fcb94c8b..fd9bbd8d4 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE_FILE ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) -if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") +if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj ) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 2c506ad94..179703172 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -4,11 +4,11 @@ function(vcpkg_configure_cmake) if(_csc_GENERATOR) set(GENERATOR ${_csc_GENERATOR}) - elseif(TRIPLET_SYSTEM_NAME MATCHES "uwp" AND TRIPLET_SYSTEM_ARCH MATCHES "x86") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x86") set(GENERATOR "Visual Studio 14 2015") - elseif(TRIPLET_SYSTEM_NAME MATCHES "uwp" AND TRIPLET_SYSTEM_ARCH MATCHES "x64") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x64") set(GENERATOR "Visual Studio 14 2015 Win64") - elseif(TRIPLET_SYSTEM_NAME MATCHES "uwp" AND TRIPLET_SYSTEM_ARCH MATCHES "arm") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "arm") set(GENERATOR "Visual Studio 14 2015 ARM") # elseif(NOT vcpkg_configure_cmake_NINJA MATCHES "NOTFOUND") # set(GENERATOR "Ninja") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 762997491..4e28cbb67 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -33,7 +33,6 @@ endif() if(CMD MATCHES "^BUILD$") string(REGEX REPLACE "([^-]*)-([^-]*)" "\\1" TRIPLET_SYSTEM_ARCH ${TARGET_TRIPLET}) - string(REGEX REPLACE "([^-]*)-([^-]*)" "\\2" TRIPLET_SYSTEM_NAME ${TARGET_TRIPLET}) set(CMAKE_TRIPLET_FILE ${VCPKG_ROOT_DIR}/triplets/${TARGET_TRIPLET}.cmake) if(NOT EXISTS ${CMAKE_TRIPLET_FILE}) |