diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index 380bf5f6..90d6c8df 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -106,9 +106,6 @@ if(PROJECT_ENABLE_BOOST) install ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - boost_project - ) + list(APPEND PROJECT_DEPENDENCIES boost_project) endif() endif() diff --git a/cmake/libraries/cpp_httplib.cmake b/cmake/libraries/cpp_httplib.cmake index f6a9b1eb..1082f1e6 100644 --- a/cmake/libraries/cpp_httplib.cmake +++ b/cmake/libraries/cpp_httplib.cmake @@ -27,10 +27,7 @@ if(PROJECT_ENABLE_CPP_HTTPLIB) -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS} ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - cpphttplib_project - ) + list(APPEND PROJECT_DEPENDENCIES cpphttplib_project) add_dependencies(cpphttplib_project curl_project) diff --git a/cmake/libraries/curl.cmake b/cmake/libraries/curl.cmake index e28d79c9..2fccf58f 100644 --- a/cmake/libraries/curl.cmake +++ b/cmake/libraries/curl.cmake @@ -46,10 +46,7 @@ if(PROJECT_ENABLE_CURL) -DZLIB_USE_STATIC_LIBS=${ZLIB_USE_STATIC_LIBS} ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - curl_project - ) + list(APPEND PROJECT_DEPENDENCIES curl_project) if(PROJECT_ENABLE_OPENSSL) add_dependencies(curl_project openssl_project) diff --git a/cmake/libraries/json.cmake b/cmake/libraries/json.cmake index f11eb554..bacfdeed 100644 --- a/cmake/libraries/json.cmake +++ b/cmake/libraries/json.cmake @@ -27,9 +27,6 @@ if(PROJECT_ENABLE_JSON) -DJSON_MultipleHeaders=OFF ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - json_project - ) + list(APPEND PROJECT_DEPENDENCIES json_project) endif() endif() diff --git a/cmake/libraries/libsodium.cmake b/cmake/libraries/libsodium.cmake index 0e51d90e..853ce345 100644 --- a/cmake/libraries/libsodium.cmake +++ b/cmake/libraries/libsodium.cmake @@ -39,9 +39,6 @@ if(PROJECT_ENABLE_LIBSODIUM) INSTALL_COMMAND make install ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - libsodium_project - ) + list(APPEND PROJECT_DEPENDENCIES libsodium_project) endif() endif() diff --git a/cmake/libraries/openssl.cmake b/cmake/libraries/openssl.cmake index c8e3d474..b2031f93 100644 --- a/cmake/libraries/openssl.cmake +++ b/cmake/libraries/openssl.cmake @@ -51,9 +51,6 @@ if(PROJECT_ENABLE_OPENSSL) INSTALL_COMMAND make install ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - openssl_project - ) + list(APPEND PROJECT_DEPENDENCIES openssl_project) endif() endif() diff --git a/cmake/libraries/pugixml.cmake b/cmake/libraries/pugixml.cmake index 63d75fa8..cbb43dfc 100644 --- a/cmake/libraries/pugixml.cmake +++ b/cmake/libraries/pugixml.cmake @@ -28,9 +28,6 @@ if(PROJECT_ENABLE_PUGIXML) -DBUILD_STATIC_LIBS=ON ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - pugixml_project - ) + list(APPEND PROJECT_DEPENDENCIES pugixml_project) endif() endif() diff --git a/cmake/libraries/spdlog.cmake b/cmake/libraries/spdlog.cmake index 724192e9..a6f1109e 100644 --- a/cmake/libraries/spdlog.cmake +++ b/cmake/libraries/spdlog.cmake @@ -25,9 +25,6 @@ if(PROJECT_ENABLE_SPDLOG) -DSPDLOG_FMT_EXTERNAL_HO=OFF ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - spdlog_project - ) + list(APPEND PROJECT_DEPENDENCIES spdlog_project) endif() endif() diff --git a/cmake/libraries/sqlite.cmake b/cmake/libraries/sqlite.cmake index 7c2617ca..140c3b7c 100644 --- a/cmake/libraries/sqlite.cmake +++ b/cmake/libraries/sqlite.cmake @@ -24,9 +24,6 @@ if(PROJECT_ENABLE_SQLITE) INSTALL_COMMAND echo "No install" ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - sqlite_project - ) + list(APPEND PROJECT_DEPENDENCIES sqlite_project) endif() endif() diff --git a/cmake/libraries/stduuid.cmake b/cmake/libraries/stduuid.cmake index 96d3dddb..73e11d35 100644 --- a/cmake/libraries/stduuid.cmake +++ b/cmake/libraries/stduuid.cmake @@ -25,9 +25,6 @@ if(PROJECT_ENABLE_STDUUID) -DUUID_USING_CXX20_SPAN=ON ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - stduuid_project - ) + list(APPEND PROJECT_DEPENDENCIES stduuid_project) endif() endif() diff --git a/cmake/libraries/testing.cmake b/cmake/libraries/testing.cmake index 57efbd55..03a2de85 100644 --- a/cmake/libraries/testing.cmake +++ b/cmake/libraries/testing.cmake @@ -12,9 +12,6 @@ if (PROJECT_ENABLE_TESTING) -DBUILD_STATIC_LIBS=ON ) - set(PROJECT_DEPENDENCIES - ${PROJECT_DEPENDENCIES} - gtest_project - ) + list(APPEND PROJECT_DEPENDENCIES gtest_project) endif() endif() diff --git a/cmake/versions.cmake b/cmake/versions.cmake index 474d8b2b..fede2ccf 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -8,6 +8,7 @@ set(BOOST_PATCH_VERSION 0) set(CLI11_VERSION 2.4.2) set(CPP_HTTPLIB_VERSION 0.16.0) set(CURL_VERSION 8.8.0) +set(CXXOPTS_VERSION 3.2.0) set(DTL_VERSION 2.01) set(EXPAT_VERSION 2.6.2) set(FLAC_VERSION 1.4.3) @@ -32,6 +33,7 @@ set(PKG_CONFIG_VERSION 0.29.2) set(PUGIXML_VERSION 1.14) set(ROCKSDB_VERSION 9.4.0) set(SECP256K1_VERSION 0.1.0.20) +set(SDL_VERSION 2.30.5) set(SFML_VERSION 2.6.1) set(SPDLOG_VERSION 1.14.1) set(SQLITE_VERSION 3460000)