diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake index 30e8a87b..0e4d1a79 100644 --- a/cmake/libraries.cmake +++ b/cmake/libraries.cmake @@ -1,22 +1,16 @@ find_package(PkgConfig REQUIRED) -set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) -set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) -set(LIBEVENT_STATIC_LINK ${PROJECT_STATIC_LINK}) -set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) -set(SFML_STATIC_LIBRARIES ${PROJECT_STATIC_LINK}) set(ZLIB_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) -set(wxWidgets_USE_STATIC ${PROJECT_STATIC_LINK}) -set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR}) +include(cmake/libraries/openssl.cmake) include(cmake/libraries/boost.cmake) + include(cmake/libraries/cpp_httplib.cmake) include(cmake/libraries/curl.cmake) include(cmake/libraries/fuse.cmake) include(cmake/libraries/json.cmake) include(cmake/libraries/libsodium.cmake) -include(cmake/libraries/openssl.cmake) include(cmake/libraries/pugixml.cmake) include(cmake/libraries/sqlite.cmake) include(cmake/libraries/stduuid.cmake) diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index cf39f432..380bf5f6 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -1,3 +1,5 @@ +set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) + if(PROJECT_ENABLE_BOOST) add_definitions(-DPROJECT_ENABLE_BOOST) diff --git a/cmake/libraries/curl.cmake b/cmake/libraries/curl.cmake index d9e25c6b..e28d79c9 100644 --- a/cmake/libraries/curl.cmake +++ b/cmake/libraries/curl.cmake @@ -1,3 +1,5 @@ +set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) + if(PROJECT_ENABLE_CURL) if(PROJECT_BUILD) find_package(CURL ${CURL_VERSION} REQUIRED) diff --git a/cmake/libraries/openssl.cmake b/cmake/libraries/openssl.cmake index 057e2073..c8e3d474 100644 --- a/cmake/libraries/openssl.cmake +++ b/cmake/libraries/openssl.cmake @@ -1,3 +1,6 @@ +set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR}) +set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK}) + if(PROJECT_ENABLE_OPENSSL) if(PROJECT_BUILD) find_package(OpenSSL ${OPENSSL_VERSION} REQUIRED)