updated build system
Some checks are pending
BlockStorage/repertory/pipeline/head Build queued...

This commit is contained in:
2024-08-04 12:31:36 -05:00
parent 32facdc2ff
commit 468093227d
6 changed files with 11 additions and 15 deletions

View File

@ -18,7 +18,6 @@ if(PROJECT_ENABLE_BOOST)
if(PROJECT_BUILD)
add_definitions(-DPROJECT_ENABLE_BOOST)
set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} EXACT
REQUIRED
COMPONENTS

View File

@ -2,7 +2,6 @@ if(PROJECT_ENABLE_CURL)
if(PROJECT_BUILD)
add_definitions(-DPROJECT_ENABLE_CURL)
set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
find_package(CURL ${CURL_VERSION} REQUIRED)
include_directories(BEFORE SYSTEM ${CURL_INCLUDE_DIRS})

View File

@ -1,14 +1,12 @@
set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
if(PROJECT_ENABLE_OPENSSL)
if(PROJECT_BUILD)
add_definitions(-DPROJECT_ENABLE_OPENSSL)
set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
find_package(OpenSSL ${OPENSSL_VERSION} REQUIRED)
include_directories(BEFORE SYSTEM
${OPENSSL_INCLUDE_DIR}
)
include_directories(BEFORE SYSTEM ${OPENSSL_INCLUDE_DIR})
link_libraries(
OpenSSL::Crypto
@ -27,12 +25,6 @@ if(PROJECT_ENABLE_OPENSSL)
set(OPENSSL_CROSS_PREFIX "--cross-compile-prefix=x86_64-w64-mingw32-")
endif()
if(PROJECT_BUILD_SHARED_LIBS)
set(OPENSSL_NO_SHARED shared)
else()
set(OPENSSL_NO_SHARED no-shared)
endif()
ExternalProject_Add(openssl_project
PREFIX external
URL ${PROJECT_3RD_PARTY_DIR}/openssl-${OPENSSL_VERSION}.tar.gz
@ -45,7 +37,7 @@ if(PROJECT_ENABLE_OPENSSL)
--prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
no-apps
no-docs
${OPENSSL_NO_SHARED}
no-shared
BUILD_COMMAND make -j1
INSTALL_COMMAND make install
)