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 
lib: fix builds, notes
This commit is contained in:
IR4T4 2019-03-03 14:33:03 +01:00 committed by GitHub
parent b97a27a045
commit 9ca0542daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
CMakeLists.txt
View file

@ -4,31 +4,39 @@ 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) # note/FIXME/clarify:
find_program(NASM_EXECUTABLE nasm) # when features are disabled this script is still
if(NOT NASM_EXECUTABLE) # adding the related targets? F.e. LUA_FEATURE is Off and BUNDLED_LUA On
message(FATAL_ERROR "NASM not found") # see usage of BUNDLED_LUA below (BUNDLED_OPENSSL, BUNDLED OPENAL ...)
endif()
FIND_PACKAGE(perl REQUIRED)
if(NOT PERL_FOUND)
message(FATAL_ERROR "Perl not found")
endif()
if(WIN32)
if(64BITS)
set(openssl_plat VC-WIN64)
# set(curl_plat x64)
else()
set(openssl_plat VC-WIN32)
# set(curl_plat x86)
endif()
endif()
endif()
#CMAKE_DEBUG_POSTFIX #CMAKE_DEBUG_POSTFIX
if(WIN32) if(WIN32)
# moved for now until linux BUNDLED_OPENSSL is done
if(BUNDLED_OPENSSL)
find_program(NASM_EXECUTABLE nasm)
if(NOT NASM_EXECUTABLE)
message(FATAL_ERROR "NASM not found")
endif()
# FIXME: there is no findPerl cmake script in project?! (at least for *NIX)
FIND_PACKAGE(perl REQUIRED)
if(NOT PERL_FOUND)
message(FATAL_ERROR "Perl not found")
endif()
if(WIN32)
if(64BITS)
set(openssl_plat VC-WIN64)
# set(curl_plat x64)
else()
set(openssl_plat VC-WIN32)
# set(curl_plat x86)
endif()
endif()
endif()
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Build bundled JPEG library # Build bundled JPEG library
#----------------------------------------------------------------- #-----------------------------------------------------------------
@ -401,11 +409,22 @@ elseif(UNIX)
endif() endif()
endif(CROSS_COMPILE32) endif(CROSS_COMPILE32)
if (BUNDLED_OPENSSL AND (BUILD_CLIENT OR BUILD_SERVER))
# FIXME:
# add BUNDLED_OPENSSL
# and enable ssl in CURL
endif()
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Build bundled cURL library # Build bundled cURL library
#----------------------------------------------------------------- #-----------------------------------------------------------------
if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER)) if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
# FIXME: add openssl lib to project
# set --with-ssl / remove --without-ssl
ExternalProject_Add( ExternalProject_Add(
bundled_curl bundled_curl
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/curl SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/curl
@ -416,7 +435,7 @@ elseif(UNIX)
--enable-proxy --disable-dict --disable-telnet --enable-proxy --disable-dict --disable-telnet
--disable-tftp --disable-pop3 --disable-imap --disable-tftp --disable-pop3 --disable-imap
--disable-smb --disable-smtp --disable-gopher --disable-smb --disable-smtp --disable-gopher
--without-ssl --without-libssh2 --without-nghttp2 --without-libssh2 --without-nghttp2
--without-gssapi --with-zlib --without-brotli --without-gssapi --with-zlib --without-brotli
--disable-ares --enable-threaded-resolver --disable-ares --enable-threaded-resolver
--enable-ipv6 --enable-unix-sockets --enable-ipv6 --enable-unix-sockets
@ -424,6 +443,7 @@ elseif(UNIX)
--disable-sspi --enable-libgcc --disable-sspi --enable-libgcc
--without-libmetalink --without-libpsl --without-libmetalink --without-libpsl
--without-librtmp ${CROSS_COMPILE32_FLAGS} --without-librtmp ${CROSS_COMPILE32_FLAGS}
--without-ssl
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libs/curl PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libs/curl
BUILD_COMMAND make BUILD_COMMAND make
INSTALL_COMMAND make install INSTALL_COMMAND make install