fix hardcode of OPENSSL_CONF_SOURCE in CMakeLists.txt
This commit is contained in:
parent
ac982cae2a
commit
650c0a3c62
1 changed files with 6 additions and 8 deletions
|
|
@ -511,14 +511,12 @@ ENDIF()
|
||||||
IF("${OPENSSL_ROOT_DIR}" STREQUAL "")
|
IF("${OPENSSL_ROOT_DIR}" STREQUAL "")
|
||||||
get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_INCLUDE_DIR}/.." REALPATH)
|
get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_INCLUDE_DIR}/.." REALPATH)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
IF("${OPENSSL_ROOT_DIR}" STREQUAL "C:/Program Files/OpenSSL")
|
IF("${OPENSSL_CONF_SOURCE}" STREQUAL "")
|
||||||
SET(OPENSSL_CONF_SOURCE "C:/Program Files/Common Files/SSL/openssl.cnf")
|
SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf")
|
||||||
ELSE()
|
IF(MINGW)
|
||||||
SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf")
|
SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/openssl.cnf")
|
||||||
ENDIF()
|
ENDIF(MINGW)
|
||||||
IF(MINGW)
|
ENDIF()
|
||||||
SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/openssl.cnf")
|
|
||||||
ENDIF(MINGW)
|
|
||||||
SET(POST_BUILD_STEP_COMMANDS ${POST_BUILD_STEP_COMMANDS}
|
SET(POST_BUILD_STEP_COMMANDS ${POST_BUILD_STEP_COMMANDS}
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENSSL_CONF_SOURCE}" "${OPENSSL_CONF_TARGET}/openssl.cnf")
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENSSL_CONF_SOURCE}" "${OPENSSL_CONF_TARGET}/openssl.cnf")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue