aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-09-19 17:38:38 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-09-19 17:39:04 -0700
commit6687266e3d0e45912fdcc072ad8720d3ae433392 (patch)
treeb8744908e4e291509bc9c433895d25e28fb642f2
parentfe62b410858c0740fa82bb180b3703b4cd21deac (diff)
downloadvcpkg-6687266e3d0e45912fdcc072ad8720d3ae433392.tar.gz
vcpkg-6687266e3d0e45912fdcc072ad8720d3ae433392.zip
[openssl] Fix regression in OpenSSL w.r.t. NMake and MSBuild
-rw-r--r--ports/openssl/portfile.cmake16
1 files changed, 15 insertions, 1 deletions
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 1133bf471..3737b0e86 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -27,7 +27,21 @@ vcpkg_configure_cmake(
-DTARGET_TRIPLET=${TARGET_TRIPLET}
)
-vcpkg_build_cmake()
+message(STATUS "Build ${TARGET_TRIPLET}-rel")
+vcpkg_execute_required_process(
+ COMMAND ${CMAKE_COMMAND} --build .
+ WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+ LOGNAME build-${TARGET_TRIPLET}-rel
+)
+message(STATUS "Build ${TARGET_TRIPLET}-rel done")
+
+message(STATUS "Build ${TARGET_TRIPLET}-dbg")
+vcpkg_execute_required_process(
+ COMMAND ${CMAKE_COMMAND} --build .
+ WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+ LOGNAME build-${TARGET_TRIPLET}-dbg
+)
+message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE