diff options
| author | Jiri Hruska <jihruska@microsoft.com> | 2017-03-08 18:53:04 +0100 |
|---|---|---|
| committer | Jiri Hruska <jihruska@microsoft.com> | 2017-03-08 18:53:04 +0100 |
| commit | ad30f9dbe6a0946abfcc00532dfcb839c1e32710 (patch) | |
| tree | aab898918cd145d43851045fcbeabfb61a352237 | |
| parent | cabf99d53fda160af95629f508228b47a7cf25c7 (diff) | |
| download | vcpkg-ad30f9dbe6a0946abfcc00532dfcb839c1e32710.tar.gz vcpkg-ad30f9dbe6a0946abfcc00532dfcb839c1e32710.zip | |
[openssl] Consistently use OPENSSL_VERSION instead of just VERSION
The inner CMakeLists.txt used to reference ${VERSION} everywhere except
as the working directory for patching, where ${OPENSSL_VERSION} was used
and the patches did not get applied because of that.
This changes it to use ${OPENSSL_VERSION} everywhere instead, consistent
with the name of this variable in the parent portfile.cmake.
| -rw-r--r-- | ports/openssl/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/openssl/CMakeLists.txt b/ports/openssl/CMakeLists.txt index a82f14d60..ca1de18c0 100644 --- a/ports/openssl/CMakeLists.txt +++ b/ports/openssl/CMakeLists.txt @@ -58,25 +58,25 @@ endif() vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION} + WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE} ) vcpkg_execute_required_process( COMMAND ${OPENSSL_DO} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION} + WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE} ) if(BUILD_SHARED_LIBS) add_custom_command(OUTPUT ${OPENSSLDIR}/bin/ssleay32.dll ${OPENSSLDIR}/bin/libeay32.dll COMMAND ${NMAKE} -f ms\\ntdll.mak install - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION} + WORKING_DIRECTORY ${SOURCE_PATH} ) add_custom_target(openssl ALL DEPENDS ${OPENSSLDIR}/bin/ssleay32.dll ${OPENSSLDIR}/bin/libeay32.dll) else() add_custom_command(OUTPUT ${OPENSSLDIR}/bin/ssleay32.lib ${OPENSSLDIR}/bin/libeay32.lib COMMAND ${NMAKE} -f ms\\nt.mak install - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openssl-${VERSION} + WORKING_DIRECTORY ${SOURCE_PATH} ) add_custom_target(openssl ALL DEPENDS ${OPENSSLDIR}/bin/ssleay32.lib ${OPENSSLDIR}/bin/libeay32.lib) endif() diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 042278943..2a18fb654 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -35,7 +35,7 @@ vcpkg_configure_cmake( -DOPENSSL_SOURCE_ARCHIVE=${OPENSSL_SOURCE_ARCHIVE} -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DTRIPLET_SYSTEM_ARCH=${TRIPLET_SYSTEM_ARCH} - -DVERSION=${OPENSSL_VERSION} + -DOPENSSL_VERSION=${OPENSSL_VERSION} -DTARGET_TRIPLET=${TARGET_TRIPLET} ) |