The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[openssl] Consistently use OPENSSL_VERSION instead of just VERSION

Browse Source 
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.
This commit is contained in:
Jiri Hruska 2017-03-08 18:53:04 +01:00
parent cabf99d53f
commit ad30f9dbe6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/openssl/CMakeLists.txt
View File

@ -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()

2
ports/openssl/portfile.cmake
View File

@ -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}
)