aboutsummaryrefslogtreecommitdiff
path: root/ports/openssl-uwp
diff options
context:
space:
mode:
authorSeekingMeaning <meaningseeking@protonmail.com>2020-01-22 12:15:26 -0800
committerVictor Romero <romerosanchezv@gmail.com>2020-01-22 12:15:26 -0800
commit181ec3b6492038f037bdef740f47a979781a3d59 (patch)
tree5180913c456bd5290bc11791a740cb1ebedd2508 /ports/openssl-uwp
parentd3a1bf94685375955c18a94abd3325a2f401b067 (diff)
downloadvcpkg-181ec3b6492038f037bdef740f47a979781a3d59.tar.gz
vcpkg-181ec3b6492038f037bdef740f47a979781a3d59.zip
Update portfiles to use VCPKG_BUILD_TYPE (#9703)
* Update portfiles to use VCPKG_BUILD_TYPE * Update * Update * Update port versions * Update * Update * Update * Update
Diffstat (limited to 'ports/openssl-uwp')
-rw-r--r--ports/openssl-uwp/CONTROL2
-rw-r--r--ports/openssl-uwp/portfile.cmake10
2 files changed, 5 insertions, 7 deletions
diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL
index 7327b57b1..a4a8e681a 100644
--- a/ports/openssl-uwp/CONTROL
+++ b/ports/openssl-uwp/CONTROL
@@ -1,3 +1,3 @@
Source: openssl-uwp
-Version: 1.1.1d
+Version: 1.1.1d-1
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.
diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake
index c11763ee6..8e97a6bf7 100644
--- a/ports/openssl-uwp/portfile.cmake
+++ b/ports/openssl-uwp/portfile.cmake
@@ -1,7 +1,5 @@
-include(vcpkg_common_functions)
-
-if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- message(FATAL_ERROR "This portfile only supports UWP")
+if (NOT VCPKG_TARGET_IS_UWP)
+ message(FATAL_ERROR "${PORT} only supports UWP")
endif()
if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
@@ -96,7 +94,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
vcpkg_execute_required_process(
COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
- LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
+ LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-rel
)
message(STATUS "Configure ${TARGET_TRIPLET}-rel done")
@@ -135,7 +133,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_execute_required_process(
COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
- LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
+ LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-dbg
)
message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")