diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-07 21:54:23 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-07 21:54:23 -0800 |
| commit | 68fe8b5391b5b59ccfc99244dc5c5032b4f823f2 (patch) | |
| tree | 3f143adbdafc43de20f2a1cd5b8272b9ba58d743 | |
| parent | c1a87697dd684d23f25d7dc01a1927e58374ffca (diff) | |
| download | vcpkg-68fe8b5391b5b59ccfc99244dc5c5032b4f823f2.tar.gz vcpkg-68fe8b5391b5b59ccfc99244dc5c5032b4f823f2.zip | |
[openssl] Merge openssl-microsoft and openssl
| -rw-r--r-- | ports/openssl-microsoft/CONTROL | 3 | ||||
| -rw-r--r-- | ports/openssl/make-openssl.bat (renamed from ports/openssl-microsoft/make-openssl.bat) | 0 | ||||
| -rw-r--r-- | ports/openssl/portfile-uwp.cmake (renamed from ports/openssl-microsoft/portfile.cmake) | 16 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/openssl/setVSvars.bat (renamed from ports/openssl-microsoft/setVSvars.bat) | 0 |
5 files changed, 15 insertions, 10 deletions
diff --git a/ports/openssl-microsoft/CONTROL b/ports/openssl-microsoft/CONTROL deleted file mode 100644 index 8b67282ac..000000000 --- a/ports/openssl-microsoft/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: openssl-microsoft -Version: 1.0.2-winrt-stable -Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. This is Microsofts fork of openssl that supports Windows Phone and Store apps. diff --git a/ports/openssl-microsoft/make-openssl.bat b/ports/openssl/make-openssl.bat index 4c038094d..4c038094d 100644 --- a/ports/openssl-microsoft/make-openssl.bat +++ b/ports/openssl/make-openssl.bat diff --git a/ports/openssl-microsoft/portfile.cmake b/ports/openssl/portfile-uwp.cmake index 30d85abf7..4e745ebba 100644 --- a/ports/openssl-microsoft/portfile.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -6,20 +6,22 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() -if (TARGET_TRIPLET MATCHES "arm-uwp") +if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "This portfile only supports UWP") +endif() + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(UWP_PLATFORM "arm") -elseif (TARGET_TRIPLET MATCHES "x64-uwp") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(UWP_PLATFORM "x64") -elseif (TARGET_TRIPLET MATCHES "x86-uwp") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(UWP_PLATFORM "Win32") else () - message(FATAL_ERROR "Only UWP DLL builds are supported at the moment") + message(FATAL_ERROR "Unsupported architecture") endif() include(vcpkg_common_functions) @@ -108,4 +110,4 @@ file(INSTALL ${SOURCE_PATH}/out32dll/ssleay32.lib -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl-microsoft RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl RENAME copyright) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 49d322095..c5ddb7489 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,4 +1,10 @@ include(${CMAKE_TRIPLET_FILE}) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + include(${CMAKE_CURRENT_LIST_DIR}/portfile-uwp.cmake) + return() +endif() + include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl-microsoft/setVSvars.bat b/ports/openssl/setVSvars.bat index 23259821e..23259821e 100644 --- a/ports/openssl-microsoft/setVSvars.bat +++ b/ports/openssl/setVSvars.bat |