etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2025-02-23 20:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update CMakeLists.txt

Browse source 
Fix build. Use bundled openssl libs only when feature openssl is active
This commit is contained in:
IR4T4 2019-01-30 12:21:19 +01:00 committed by GitHub
parent f04f846898
commit 8159d2b8a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
CMakeLists.txt
View file

@ -4,7 +4,7 @@ include(CheckIncludeFile)
set(LIBS_BINARYDIR_DIR ${PROJECT_BINARY_DIR}/libs) set(LIBS_BINARYDIR_DIR ${PROJECT_BINARY_DIR}/libs)
set(LIBS_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads) set(LIBS_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
if(BUNDLED_OPENSSL) if(FEATURE_OPENSSL AND BUNDLED_OPENSSL)
find_program(NASM_EXECUTABLE nasm) find_program(NASM_EXECUTABLE nasm)
if(NOT NASM_EXECUTABLE) if(NOT NASM_EXECUTABLE)
message(FATAL_ERROR "NASM not found") message(FATAL_ERROR "NASM not found")
@ -130,29 +130,31 @@ if(WIN32)
set_target_properties(bundled_jpeg PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER}) set_target_properties(bundled_jpeg PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
endif() endif()
if(BUNDLED_OPENSSL AND (BUILD_CLIENT OR BUILD_SERVER)) if(FEATURE_OPENSSL)
set(OPENSSL_PREFIX "${CMAKE_BINARY_DIR}/openssl/build") if(BUNDLED_OPENSSL AND (BUILD_CLIENT OR BUILD_SERVER))
set(OPENSSL_CONFIGURE "${PERL_EXECUTABLE}" Configure "${openssl_plat}" "--prefix=${OPENSSL_PREFIX}" "--openssldir=${OPENSSL_PREFIX}" no-shared no-unit-test -static) set(OPENSSL_PREFIX "${CMAKE_BINARY_DIR}/openssl/build")
set(OPENSSL_BUILD nmake) set(OPENSSL_CONFIGURE "${PERL_EXECUTABLE}" Configure "${openssl_plat}" "--prefix=${OPENSSL_PREFIX}" "--openssldir=${OPENSSL_PREFIX}" no-shared no-unit-test -static)
set(OPENSSL_INSTALL nmake install) set(OPENSSL_BUILD nmake)
ExternalProject_Add(bundled_openssl set(OPENSSL_INSTALL nmake install)
# Use github archive instead of the one hosted on openssl.org because of CMake bug #13251 ExternalProject_Add(bundled_openssl
#URL_MD5 "9e380f6f9cc497bd2f47c944019239ac" # Use github archive instead of the one hosted on openssl.org because of CMake bug #13251
#GIT_REPOSITORY "https://github.com/openssl/openssl.git" #URL_MD5 "9e380f6f9cc497bd2f47c944019239ac"
DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}/openssl #GIT_REPOSITORY "https://github.com/openssl/openssl.git"
URL https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR}/openssl
SOURCE_DIR "${CMAKE_BINARY_DIR}/openssl" URL https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz
BUILD_IN_SOURCE 1 SOURCE_DIR "${CMAKE_BINARY_DIR}/openssl"
CONFIGURE_COMMAND ${OPENSSL_CONFIGURE} BUILD_IN_SOURCE 1
BUILD_COMMAND ${OPENSSL_BUILD} CONFIGURE_COMMAND ${OPENSSL_CONFIGURE}
INSTALL_COMMAND ${OPENSSL_INSTALL} BUILD_COMMAND ${OPENSSL_BUILD}
) INSTALL_COMMAND ${OPENSSL_INSTALL}
set(OPENSSL_BUNDLED_INCLUDE_DIR "${OPENSSL_PREFIX}/include") )
set(OPENSSL_BUNDLED_LIBRARY "${OPENSSL_PREFIX}/lib/libcrypto.lib" "${OPENSSL_PREFIX}/lib/libssl.lib") set(OPENSSL_BUNDLED_INCLUDE_DIR "${OPENSSL_PREFIX}/include")
set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER}) set(OPENSSL_BUNDLED_LIBRARY "${OPENSSL_PREFIX}/lib/libcrypto.lib" "${OPENSSL_PREFIX}/lib/libssl.lib")
else() set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
add_custom_target(bundled_openssl) else()
set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER}) add_custom_target(bundled_openssl)
set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
endif()
endif() endif()
#----------------------------------------------------------------- #-----------------------------------------------------------------