updated build system
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good

This commit is contained in:
Scott E. Graves 2024-07-28 09:27:35 -05:00
parent ffea22c71b
commit 39888a1ebc
12 changed files with 13 additions and 44 deletions

View File

@ -106,9 +106,6 @@ if(PROJECT_ENABLE_BOOST)
install install
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES boost_project)
${PROJECT_DEPENDENCIES}
boost_project
)
endif() endif()
endif() endif()

View File

@ -27,10 +27,7 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
-DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS} -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES cpphttplib_project)
${PROJECT_DEPENDENCIES}
cpphttplib_project
)
add_dependencies(cpphttplib_project curl_project) add_dependencies(cpphttplib_project curl_project)

View File

@ -46,10 +46,7 @@ if(PROJECT_ENABLE_CURL)
-DZLIB_USE_STATIC_LIBS=${ZLIB_USE_STATIC_LIBS} -DZLIB_USE_STATIC_LIBS=${ZLIB_USE_STATIC_LIBS}
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES curl_project)
${PROJECT_DEPENDENCIES}
curl_project
)
if(PROJECT_ENABLE_OPENSSL) if(PROJECT_ENABLE_OPENSSL)
add_dependencies(curl_project openssl_project) add_dependencies(curl_project openssl_project)

View File

@ -27,9 +27,6 @@ if(PROJECT_ENABLE_JSON)
-DJSON_MultipleHeaders=OFF -DJSON_MultipleHeaders=OFF
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES json_project)
${PROJECT_DEPENDENCIES}
json_project
)
endif() endif()
endif() endif()

View File

@ -39,9 +39,6 @@ if(PROJECT_ENABLE_LIBSODIUM)
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES libsodium_project)
${PROJECT_DEPENDENCIES}
libsodium_project
)
endif() endif()
endif() endif()

View File

@ -51,9 +51,6 @@ if(PROJECT_ENABLE_OPENSSL)
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES openssl_project)
${PROJECT_DEPENDENCIES}
openssl_project
)
endif() endif()
endif() endif()

View File

@ -28,9 +28,6 @@ if(PROJECT_ENABLE_PUGIXML)
-DBUILD_STATIC_LIBS=ON -DBUILD_STATIC_LIBS=ON
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES pugixml_project)
${PROJECT_DEPENDENCIES}
pugixml_project
)
endif() endif()
endif() endif()

View File

@ -25,9 +25,6 @@ if(PROJECT_ENABLE_SPDLOG)
-DSPDLOG_FMT_EXTERNAL_HO=OFF -DSPDLOG_FMT_EXTERNAL_HO=OFF
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES spdlog_project)
${PROJECT_DEPENDENCIES}
spdlog_project
)
endif() endif()
endif() endif()

View File

@ -24,9 +24,6 @@ if(PROJECT_ENABLE_SQLITE)
INSTALL_COMMAND echo "No install" INSTALL_COMMAND echo "No install"
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES sqlite_project)
${PROJECT_DEPENDENCIES}
sqlite_project
)
endif() endif()
endif() endif()

View File

@ -25,9 +25,6 @@ if(PROJECT_ENABLE_STDUUID)
-DUUID_USING_CXX20_SPAN=ON -DUUID_USING_CXX20_SPAN=ON
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES stduuid_project)
${PROJECT_DEPENDENCIES}
stduuid_project
)
endif() endif()
endif() endif()

View File

@ -12,9 +12,6 @@ if (PROJECT_ENABLE_TESTING)
-DBUILD_STATIC_LIBS=ON -DBUILD_STATIC_LIBS=ON
) )
set(PROJECT_DEPENDENCIES list(APPEND PROJECT_DEPENDENCIES gtest_project)
${PROJECT_DEPENDENCIES}
gtest_project
)
endif() endif()
endif() endif()

View File

@ -8,6 +8,7 @@ set(BOOST_PATCH_VERSION 0)
set(CLI11_VERSION 2.4.2) set(CLI11_VERSION 2.4.2)
set(CPP_HTTPLIB_VERSION 0.16.0) set(CPP_HTTPLIB_VERSION 0.16.0)
set(CURL_VERSION 8.8.0) set(CURL_VERSION 8.8.0)
set(CXXOPTS_VERSION 3.2.0)
set(DTL_VERSION 2.01) set(DTL_VERSION 2.01)
set(EXPAT_VERSION 2.6.2) set(EXPAT_VERSION 2.6.2)
set(FLAC_VERSION 1.4.3) set(FLAC_VERSION 1.4.3)
@ -32,6 +33,7 @@ set(PKG_CONFIG_VERSION 0.29.2)
set(PUGIXML_VERSION 1.14) set(PUGIXML_VERSION 1.14)
set(ROCKSDB_VERSION 9.4.0) set(ROCKSDB_VERSION 9.4.0)
set(SECP256K1_VERSION 0.1.0.20) set(SECP256K1_VERSION 0.1.0.20)
set(SDL_VERSION 2.30.5)
set(SFML_VERSION 2.6.1) set(SFML_VERSION 2.6.1)
set(SPDLOG_VERSION 1.14.1) set(SPDLOG_VERSION 1.14.1)
set(SQLITE_VERSION 3460000) set(SQLITE_VERSION 3460000)