From 993e6e035ca3bb9dc325020c366ac347f1e127fe Mon Sep 17 00:00:00 2001
From: amichelo <andrea.michelotti@lnf.infn.it>
Date: Thu, 16 Feb 2023 12:06:35 +0100
Subject: [PATCH] compile
---
ChaosMetadataService/CMakeLists.txt | 12 ++++++------
chaos/common/CMakeLists.txt | 2 +-
config/CMakeChaos.txt | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ChaosMetadataService/CMakeLists.txt b/ChaosMetadataService/CMakeLists.txt
index 176b415f3..f7b8aa820 100644
--- a/ChaosMetadataService/CMakeLists.txt
+++ b/ChaosMetadataService/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.9)
+cmake_minimum_required(VERSION 3.7)
project(ChaosMetadataService)
#add module path for permi to find lirary
@@ -144,10 +144,10 @@ ExternalProject_Add(
PREFIX "${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-prefix"
SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-build"
-INSTALL_COMMAND cp ${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-build/lib/libcouchbaseS.a ${CMAKE_INSTALL_PREFIX}/lib
+INSTALL_COMMAND cp ${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-build/lib/libcouchbase.so ${CMAKE_INSTALL_PREFIX}/lib
# BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} install
CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DLCB_INSTALL_HEADERS=ON -DCMAKE_BUILD_TYPE=Release -DLCB_NO_TESTS=ON -DLCB_NO_PLUGINS=ON -DLCB_NO_MOCK=ON -DLCB_NO_SSL=ON
+ -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DLCB_INSTALL_HEADERS=ON -DLCB_NO_PLUGINS=ON -DCMAKE_BUILD_TYPE=Release -DLCB_NO_TESTS=ON -DLCB_NO_MOCK=ON -DLCB_NO_SSL=ON
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON)
@@ -465,7 +465,7 @@ ENDIF(CHAOS_PROMETHEUS)
IF (BUILD_FORCE_STATIC )
ADD_LIBRARY(chaos_cds STATIC ${cnd_src} ${api_src} ${service_src} ${posix_src})
- TARGET_LINK_LIBRARIES(chaos_cds chaos_common couchbase mongoclient mongocxx bsoncxx )
+ TARGET_LINK_LIBRARIES(chaos_cds PRIVATE chaos_common couchbaseS.a mongoclient mongocxx bsoncxx )
ELSE (BUILD_FORCE_STATIC)
ADD_LIBRARY(chaos_cds SHARED ${posix_src} ${service_src} ${api_src} ${cnd_src}) #
# set_target_properties(chaos_cds PROPERTIES VERSION 1.0.0 SOVERSION 1)
@@ -516,9 +516,9 @@ target_compile_definitions(chaos_cds PRIVATE USE_MONGODB3_DRIVER=1)
# SET(BUILD_LIBRARY ${BUILD_LIBRARY} uv)
# SET(BUILD_LIBRARY ${BUILD_LIBRARY} cassandra)
# target_compile_definitions(${PROJECT_NAME} PRIVATE USE_CASSANDRA_DRIVER=1)
-TARGET_LINK_LIBRARIES(chaos_cds ${BUILD_LIBRARY})
+TARGET_LINK_LIBRARIES(chaos_cds PUBLIC ${BUILD_LIBRARY} PRIVATE jsoncpp.a )
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_cds ${BUILD_LIBRARY})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC chaos_cds ${BUILD_LIBRARY} )
#INSTALL_TARGETS(/bin ${PROJECT_NAME})
diff --git a/chaos/common/CMakeLists.txt b/chaos/common/CMakeLists.txt
index 4b504996f..216505c48 100644
--- a/chaos/common/CMakeLists.txt
+++ b/chaos/common/CMakeLists.txt
@@ -680,7 +680,7 @@ IF (BUILD_FORCE_STATIC )
ELSE (BUILD_FORCE_STATIC)
ADD_LIBRARY(${PROJECT_NAME} SHARED ${common_lib_src})
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1)
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC z lz4 ${EPICS_LIB} ${FrameworkLib} PRIVATE ${BUILD_LIBRARY})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC z lz4 ${EPICS_LIB} ${FrameworkLib} PRIVATE ${BUILD_LIBRARY} jsoncpp.a)
ENDIF (BUILD_FORCE_STATIC)
target_compile_definitions(${PROJECT_NAME} PRIVATE CLING_VIRTUAL_MACHINE=${CLING_VIRTUAL_MACHINE})
diff --git a/config/CMakeChaos.txt b/config/CMakeChaos.txt
index 2499e2e49..1a24a0f62 100644
--- a/config/CMakeChaos.txt
+++ b/config/CMakeChaos.txt
@@ -185,7 +185,7 @@ set(Boost_USE_STATIC_RUNTIME ON)
IF(${SYSTEM_NAME} MATCHES "Darwin")
# Mac OS X specific code
MESG("enabling MAC compilation")
- SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random jsoncpp pthread dl ${GCC_COVERAGE_LINK_LIB})
+ SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random pthread dl ${GCC_COVERAGE_LINK_LIB})
SET(CHAOS_BOOST_FLAGS toolset=clang)
CheckCompiler("CXX" clang++)
CheckCompiler("C" clang)
@@ -195,7 +195,7 @@ IF(${SYSTEM_NAME} MATCHES "Darwin")
ELSE()
- SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random jsoncpp pthread rt dl ${GCC_COVERAGE_LINK_LIB})
+ SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random pthread rt dl ${GCC_COVERAGE_LINK_LIB})
ENDIF()
--
GitLab