mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve the handling of the biboudb.hpp dependencies

Browse Source
This commit is contained in:
louiz’
2017-05-10 16:50:11 +02:00
parent 7a08196d09
commit da55060840
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -7
View File
@@ -153,17 +153,17 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/")
file(GLOB source_utils file(GLOB source_utils
src/utils/*.[hc]pp) src/utils/*.[hc]pp)
add_library(utils OBJECT ${source_utils}) add_library(utils OBJECT ${source_utils})
add_dependencies(utils database) add_dependencies(utils litesql_generated_sources)
file(GLOB source_irc file(GLOB source_irc
src/irc/*.[hc]pp) src/irc/*.[hc]pp)
add_library(irc OBJECT ${source_irc}) add_library(irc OBJECT ${source_irc})
add_dependencies(irc database) add_dependencies(irc litesql_generated_sources)
file(GLOB source_xmpp file(GLOB source_xmpp
src/xmpp/*.[hc]pp) src/xmpp/*.[hc]pp)
add_library(xmpp OBJECT ${source_xmpp}) add_library(xmpp OBJECT ${source_xmpp})
add_dependencies(xmpp database) add_dependencies(xmpp litesql_generated_sources)
file(GLOB source_identd file(GLOB source_identd
src/identd/*.[hc]pp) src/identd/*.[hc]pp)
@@ -172,7 +172,7 @@ add_library(identd OBJECT ${source_identd})
file(GLOB source_bridge file(GLOB source_bridge
src/bridge/*.[hc]pp) src/bridge/*.[hc]pp)
add_library(bridge OBJECT ${source_bridge}) add_library(bridge OBJECT ${source_bridge})
add_dependencies(bridge database) add_dependencies(bridge litesql_generated_sources)
file(GLOB source_config file(GLOB source_config
src/config/*.[hc]pp) src/config/*.[hc]pp)
@@ -185,15 +185,16 @@ add_library(logger OBJECT ${source_logger})
file(GLOB source_network file(GLOB source_network
src/network/*.[hc]pp) src/network/*.[hc]pp)
add_library(network OBJECT ${source_network}) add_library(network OBJECT ${source_network})
add_dependencies(network database)
if(LITESQL_FOUND) if(LITESQL_FOUND)
LITESQL_GENERATE_CPP("database/database.xml" LITESQL_GENERATE_CPP("database/database.xml"
"biboudb" "biboudb"
LITESQL_GENERATED_SOURCES) LITESQL_GENERATED_SOURCES)
add_custom_target(litesql_generated_sources SOURCES ${LITESQL_GENERATED_SOURCES})
add_library(database OBJECT src/database/database.cpp ${LITESQL_GENERATED_SOURCES})
add_dependencies(database litesql_generated_sources)
add_library(database OBJECT src/database/database.cpp
${LITESQL_GENERATED_SOURCES})
include_directories(database ${LITESQL_INCLUDE_DIRS}) include_directories(database ${LITESQL_INCLUDE_DIRS})
set(USE_DATABASE TRUE) set(USE_DATABASE TRUE)
else() else()
cmake/Modules/FindLITESQL.cmake
+1 -1
View File
@@ -65,7 +65,7 @@ function(LITESQL_GENERATE_CPP
add_custom_command( add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.cpp" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.cpp"
"${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.hpp" "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.hpp"
COMMAND ${LITESQLGEN_EXECUTABLE} COMMAND ${LITESQLGEN_EXECUTABLE}
ARGS -t c++ --output-dir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE} ARGS -t c++ --output-dir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE}
DEPENDS ${SOURCE_FILE} DEPENDS ${SOURCE_FILE}
COMMENT "Running litesql-gen on ${SOURCE_FILE}" COMMENT "Running litesql-gen on ${SOURCE_FILE}"
src/network/credentials_manager.cpp
-4
View File
@@ -7,10 +7,6 @@
#include <botan/tls_exceptn.h> #include <botan/tls_exceptn.h>
#include <config/config.hpp> #include <config/config.hpp>
#ifdef USE_DATABASE
# include <database/database.hpp>
#endif
/** /**
* TODO find a standard way to find that out. * TODO find a standard way to find that out.
*/ */