diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-11-20 16:28:12 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-20 16:28:12 -0800 |
| commit | 3b01335e6161cb9195fcb8928225dcb11b52cd58 (patch) | |
| tree | f5a3f8f54d46051343cd3429b456f08d437dfebf /scripts | |
| parent | 83af530a42011130b20a5080bbd298abaa77be59 (diff) | |
| download | vcpkg-3b01335e6161cb9195fcb8928225dcb11b52cd58.tar.gz vcpkg-3b01335e6161cb9195fcb8928225dcb11b52cd58.zip | |
Revert "WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets (#4688)"
This reverts commit 83af530a42011130b20a5080bbd298abaa77be59.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 8 | ||||
| -rw-r--r-- | scripts/toolchains/linux.cmake | 5 | ||||
| -rw-r--r-- | scripts/toolchains/windows.cmake | 16 |
3 files changed, 3 insertions, 26 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index b5dfb6d02..617fe1a0f 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -128,15 +128,13 @@ function(vcpkg_configure_cmake) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + endif() endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() - if(DEFINED VCPKG_CMAKE_SYSTEM_PROCESSOR) - list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_PROCESSOR=${VCPKG_CMAKE_SYSTEM_PROCESSOR}") - endif() - - list(APPEND _csc_OPTIONS "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=ON) diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index d740a5b8c..ade9db90b 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -1,10 +1,5 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
-
- # TODO: This should be replaced with a switch on VCPKG_TARGET_ARCHITECTURE once we know what linux systems "natively" define for each of the targets
- set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "")
-else()
- set(CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "")
endif()
set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index bb52e0d19..266e023b1 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -1,19 +1,3 @@ -if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "")
-endif()
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
- set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
- set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
- set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
- set(CMAKE_SYSTEM_PROCESSOR X86 CACHE STRING "")
-else()
- message(FATAL_ERROR "Unknown target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(NOT _CMAKE_IN_TRY_COMPILE)
|