aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-17 14:45:19 -0700
committerGitHub <noreply@github.com>2017-10-17 14:45:19 -0700
commit63183677af91f1c58a812a7706fe0e149bb558d8 (patch)
tree5a7d6723e962b1499be7bfd110f8462d48c2fb83
parentafe2028b754deb35a6ccf824a08abb6989b82e5d (diff)
parent3c0feb549c6cfa062254c5a691a8cad445a8bcf7 (diff)
downloadvcpkg-63183677af91f1c58a812a7706fe0e149bb558d8.tar.gz
vcpkg-63183677af91f1c58a812a7706fe0e149bb558d8.zip
Merge pull request #1997 from bjornpiltz/patch-1
Enable building openssl with custom triplet.
-rw-r--r--ports/openssl/portfile.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 8ad0ff197..9763f740e 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -37,14 +37,14 @@ set(CONFIGURE_COMMAND ${PERL} Configure
no-ssl2
)
-if(TARGET_TRIPLET MATCHES "x86-windows")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(OPENSSL_ARCH VC-WIN32)
set(OPENSSL_DO "ms\\do_nasm.bat")
-elseif(TARGET_TRIPLET MATCHES "x64-windows")
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(OPENSSL_ARCH VC-WIN64A)
set(OPENSSL_DO "ms\\do_win64a.bat")
else()
- message(FATAL_ERROR "Unsupported target triplet: ${TARGET_TRIPLET}")
+ message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)