From: Maksym Mamontov Date: Wed, 17 Aug 2022 14:44:39 +0000 (+0300) Subject: Turn Firebird back on. X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/4ec483cf24cf5474cdcacf355132070a3661c186?ds=sidebyside Turn Firebird back on. --- diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 41dc9785..b2b8ee0f 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -63,18 +63,18 @@ if ( BUILD_LIB_IA ) endif () endif ( BUILD_LIB_IA ) -#if ( BUILD_LIB_IBPP ) -# add_library ( ibpp STATIC ibpp/all_in_one.cpp ) -# target_include_directories ( ibpp PUBLIC ibpp/include ) -# target_compile_options ( ibpp PRIVATE -Wno-old-style-cast $<$:-Wno-useless-cast> ) -# -# if ( CLANG_TIDY_EXE ) -# set_target_properties ( ibpp PROPERTIES CXX_CLANG_TIDY "${DO_CLANG_TIDY}" ) -# endif () -# if ( INCLUDE_WHAT_YOU_USE_EXE ) -# set_target_properties ( ibpp PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" ) -# endif () -#endif ( BUILD_LIB_IBPP ) +if ( BUILD_LIB_IBPP ) + add_library ( ibpp STATIC ibpp/all_in_one.cpp ) + target_include_directories ( ibpp PUBLIC ibpp/include ) + target_compile_options ( ibpp PRIVATE -Wno-old-style-cast $<$:-Wno-useless-cast> ) + + if ( CLANG_TIDY_EXE ) + set_target_properties ( ibpp PROPERTIES CXX_CLANG_TIDY "${DO_CLANG_TIDY}" ) + endif () + if ( INCLUDE_WHAT_YOU_USE_EXE ) + set_target_properties ( ibpp PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" ) + endif () +endif ( BUILD_LIB_IBPP ) if ( BUILD_LIB_LOGGER ) add_library ( logger STATIC logger/logger.cpp ) diff --git a/projects/stargazer/plugins/CMakeLists.txt b/projects/stargazer/plugins/CMakeLists.txt index c30f92cf..e1e78e10 100644 --- a/projects/stargazer/plugins/CMakeLists.txt +++ b/projects/stargazer/plugins/CMakeLists.txt @@ -219,26 +219,26 @@ if ( BUILD_MOD_STORE_FILES ) endif () endif ( BUILD_MOD_STORE_FILES ) -#if ( BUILD_MOD_STORE_FIREBIRD ) -# find_package ( FBClient REQUIRED ) -# add_library ( mod_store_firebird MODULE store/firebird/firebird_store.cpp -# store/firebird/firebird_store_admins.cpp -# store/firebird/firebird_store_corporations.cpp -# store/firebird/firebird_store_messages.cpp -# store/firebird/firebird_store_services.cpp -# store/firebird/firebird_store_tariffs.cpp -# store/firebird/firebird_store_users.cpp -# store/firebird/firebird_store_utils.cpp ) -# target_link_libraries ( mod_store_firebird crypto common logger ibpp FBClient::FBClient ) -# set_target_properties ( mod_store_firebird PROPERTIES PREFIX "" ) -# -# if ( CLANG_TIDY_EXE ) -# set_target_properties ( mod_store_firebird PROPERTIES CXX_CLANG_TIDY "${DO_CLANG_TIDY}" ) -# endif () -# if ( INCLUDE_WHAT_YOU_USE_EXE ) -# set_target_properties ( mod_store_firebird PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" ) -# endif () -#endif ( BUILD_MOD_STORE_FIREBIRD ) +if ( BUILD_MOD_STORE_FIREBIRD ) + find_package ( FBClient REQUIRED ) + add_library ( mod_store_firebird MODULE store/firebird/firebird_store.cpp + store/firebird/firebird_store_admins.cpp + store/firebird/firebird_store_corporations.cpp + store/firebird/firebird_store_messages.cpp + store/firebird/firebird_store_services.cpp + store/firebird/firebird_store_tariffs.cpp + store/firebird/firebird_store_users.cpp + store/firebird/firebird_store_utils.cpp ) + target_link_libraries ( mod_store_firebird crypto common logger ibpp FBClient::FBClient ) + set_target_properties ( mod_store_firebird PROPERTIES PREFIX "" ) + + if ( CLANG_TIDY_EXE ) + set_target_properties ( mod_store_firebird PROPERTIES CXX_CLANG_TIDY "${DO_CLANG_TIDY}" ) + endif () + if ( INCLUDE_WHAT_YOU_USE_EXE ) + set_target_properties ( mod_store_firebird PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" ) + endif () +endif ( BUILD_MOD_STORE_FIREBIRD ) if ( BUILD_MOD_STORE_MYSQL ) find_package ( MySQLConnector REQUIRED )