Ostrich: reorganize build targets for more efficient builds
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f56b1b90 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f56b1b90 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f56b1b90 Branch: refs/heads/develop Commit: f56b1b9065f1fceb1d0abd54deeb5bcbd0e1ef21 Parents: b8d122a Author: Sebastian Schaffert <[email protected]> Authored: Thu Aug 25 13:03:53 2016 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Aug 25 13:03:53 2016 +0200 ---------------------------------------------------------------------- .../ostrich/backend/persistence/CMakeLists.txt | 29 ++++++++++++-------- libraries/ostrich/backend/test/CMakeLists.txt | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f56b1b90/libraries/ostrich/backend/persistence/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/libraries/ostrich/backend/persistence/CMakeLists.txt b/libraries/ostrich/backend/persistence/CMakeLists.txt index 83bb144..fcf8366 100644 --- a/libraries/ostrich/backend/persistence/CMakeLists.txt +++ b/libraries/ostrich/backend/persistence/CMakeLists.txt @@ -1,31 +1,38 @@ include_directories(.. ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/../model ${RAPTOR_INCLUDE_DIR}/raptor2) +add_library(marmotta_persistence + leveldb_sparql.cc leveldb_sparql.h + base_persistence.cc base_persistence.h + leveldb_service.cc leveldb_service.h ) +target_link_libraries(marmotta_persistence + marmotta_model marmotta_util marmotta_sparql marmotta_service + ${GLOG_LIBRARY} ${PROTOBUF_LIBRARIES}) + +if (LevelDB_FOUND) # Shared Marmotta Ostrich persistence implementation -add_library(marmotta_leveldb - leveldb_persistence.cc leveldb_persistence.h leveldb_sparql.cc leveldb_sparql.h base_persistence.cc base_persistence.h) +add_library(marmotta_leveldb leveldb_persistence.cc leveldb_persistence.h) target_link_libraries(marmotta_leveldb - marmotta_model marmotta_util marmotta_sparql marmotta_service - ${LevelDB_LIBRARY} ${GLOG_LIBRARY} ${PROTOBUF_LIBRARIES}) + marmotta_persistence ${LevelDB_LIBRARY} ${GLOG_LIBRARY} ${PROTOBUF_LIBRARIES}) # Server binary -add_executable(leveldb_persistence - leveldb_service.cc leveldb_service.h leveldb_server.cc ) +add_executable(leveldb_persistence leveldb_server.cc) target_link_libraries(leveldb_persistence marmotta_service marmotta_leveldb ${GFLAGS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${GRPC_LIBRARIES} ${Tcmalloc_LIBRARIES}) install(TARGETS leveldb_persistence DESTINATION bin) +endif() +if (RocksDB_FOUND) add_library(marmotta_rocksdb - rocksdb_persistence.cc rocksdb_persistence.h leveldb_sparql.cc leveldb_sparql.h base_persistence.cc base_persistence.h) + rocksdb_persistence.cc rocksdb_persistence.h) target_link_libraries(marmotta_rocksdb - marmotta_model marmotta_util marmotta_sparql marmotta_service - ${RocksDB_LIBRARY} ${GLOG_LIBRARY} ${PROTOBUF_LIBRARIES}) + marmotta_persistence ${RocksDB_LIBRARY} ${GLOG_LIBRARY} ${PROTOBUF_LIBRARIES}) # Server binary -add_executable(rocksdb_persistence - leveldb_service.cc leveldb_service.h rocksdb_server.cc ) +add_executable(rocksdb_persistence rocksdb_server.cc ) target_link_libraries(rocksdb_persistence marmotta_service marmotta_rocksdb ${GFLAGS_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${GRPC_LIBRARIES} ${Tcmalloc_LIBRARIES}) install(TARGETS rocksdb_persistence DESTINATION bin) +endif() # Command line admin tool http://git-wip-us.apache.org/repos/asf/marmotta/blob/f56b1b90/libraries/ostrich/backend/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/libraries/ostrich/backend/test/CMakeLists.txt b/libraries/ostrich/backend/test/CMakeLists.txt index c3beef9..a24e395 100644 --- a/libraries/ostrich/backend/test/CMakeLists.txt +++ b/libraries/ostrich/backend/test/CMakeLists.txt @@ -16,7 +16,7 @@ add_executable(leveldb_tests main.cc LevelDBTest.cc) target_link_libraries(leveldb_tests gtest marmotta_leveldb ${GLOG_LIBRARY} ${Boost_LIBRARIES}) add_executable(persistence_tests main.cc PersistenceTest.cc) -target_link_libraries(persistence_tests gtest marmotta_leveldb ${GLOG_LIBRARY} ${Boost_LIBRARIES}) +target_link_libraries(persistence_tests gtest marmotta_persistence ${GLOG_LIBRARY} ${Boost_LIBRARIES}) add_test(NAME ModelTest COMMAND model_tests) add_test(NAME SparqlTest COMMAND sparql_tests)
