aboutsummaryrefslogtreecommitdiff
path: root/ports/openssl
diff options
context:
space:
mode:
authorBarath Kannan <barathsotd@gmail.com>2017-11-06 00:33:04 +1100
committerBarath Kannan <barathsotd@gmail.com>2017-11-06 00:33:04 +1100
commitb959f70a9969551a132d691fbd12046d5ea0702e (patch)
treed15d129bd480b1ba173322a0e50140ccf1ff487a /ports/openssl
parent3a5b383bbec74dbaf0f1056e1a5d315e43d79375 (diff)
parent330b8d8bab6a3d07165bf7c05fea09a8e0d56348 (diff)
downloadvcpkg-b959f70a9969551a132d691fbd12046d5ea0702e.tar.gz
vcpkg-b959f70a9969551a132d691fbd12046d5ea0702e.zip
merge from master
Diffstat (limited to 'ports/openssl')
-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)