From f9c96ddf2dfd5846d8bb159955fefcf1001f52b1 Mon Sep 17 00:00:00 2001 From: hsc Date: Wed, 12 Sep 2012 07:52:30 +0000 Subject: [PATCH] prefix internal libraries to avoid naming conflicts with system libraries This is a precaution to avoid current and future naming conflicts with common system libraries. libutil (part of libc) is the first, but probably not the last example that already caused trouble twice. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1614 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- CMakeLists.txt | 2 +- simulators/ovp/cortexM3/CMakeLists.txt | 4 ++-- .../mmc/flakyMemory/1.0/model/CMakeLists.txt | 9 ++++----- simulators/ovp/statusmsg/CMakeLists.txt | 3 +-- simulators/ovp/test1/CMakeLists.txt | 2 +- src/CMakeLists.txt | 6 +++++- src/core/comm/CMakeLists.txt | 4 ++-- src/core/cpn/CMakeLists.txt | 4 ++-- src/core/efw/CMakeLists.txt | 6 +++--- src/core/sal/CMakeLists.txt | 4 ++-- src/core/sal/gem5/SConscript | 2 +- src/core/util/CMakeLists.txt | 4 ++-- src/experiments/checksum-oostubs/CMakeLists.txt | 6 +++--- src/experiments/cool-checksum/CMakeLists.txt | 4 ++-- src/experiments/ecos_kernel_test/CMakeLists.txt | 6 +++--- src/experiments/fault-coverage/CMakeLists.txt | 2 +- src/experiments/fire-interrupt/CMakeLists.txt | 2 +- src/experiments/hsc-simple/CMakeLists.txt | 2 +- src/experiments/l4-sys/CMakeLists.txt | 6 +++--- src/experiments/mh-test-campaign/CMakeLists.txt | 4 ++-- src/experiments/regression-test/CMakeLists.txt | 2 +- src/experiments/tracing-test/CMakeLists.txt | 4 ++-- src/experiments/vezs-example/CMakeLists.txt | 4 ++-- src/experiments/weather-monitor/CMakeLists.txt | 6 +++--- src/plugins/serialoutput/CMakeLists.txt | 2 +- src/plugins/tracing/CMakeLists.txt | 2 +- 26 files changed, 52 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 684d1172..ae6ff481 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ endif(BUILD_BOCHS) ## Additional Compiler flags ## set(CMAKE_C_FLAGS "-g -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") -## Tell the linker where to find the libfail.a +## Tell the linker where to find the Fail* libraries link_directories("${LIBRARY_OUTPUT_PATH}") # Add "simulators"-directory to the include path. This allows diff --git a/simulators/ovp/cortexM3/CMakeLists.txt b/simulators/ovp/cortexM3/CMakeLists.txt index 32eff41d..76e17967 100644 --- a/simulators/ovp/cortexM3/CMakeLists.txt +++ b/simulators/ovp/cortexM3/CMakeLists.txt @@ -7,9 +7,9 @@ set(SRCS ) add_executable(ovp_cortexM3 ${SRCS}) -add_dependencies(ovp_cortexM3 ovpstatusmessages ) +add_dependencies(ovp_cortexM3 fail-ovpstatusmessages ) -target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} sal cpn comm efw util ovpstatusmessages) +target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} fail fail-ovpstatusmessages) ## OVP links all needed shared libraries via a runtimeloader set_target_properties(ovp_cortexM3 PROPERTIES LINK_FLAGS "-L${CMAKE_BINARY_DIR}/lib -lpcl -lprotobuf -m32 ") diff --git a/simulators/ovp/ovpworld.org/mmc/flakyMemory/1.0/model/CMakeLists.txt b/simulators/ovp/ovpworld.org/mmc/flakyMemory/1.0/model/CMakeLists.txt index 5f48a2f4..5f7e4dea 100644 --- a/simulators/ovp/ovpworld.org/mmc/flakyMemory/1.0/model/CMakeLists.txt +++ b/simulators/ovp/ovpworld.org/mmc/flakyMemory/1.0/model/CMakeLists.txt @@ -4,10 +4,9 @@ set(SRCS ) add_definitions("-m32") message(STATUS "flaky ld flags: ${HOST_LDFLAGS}") -add_library(flaky SHARED ${SRCS}) +add_library(fail-flaky SHARED ${SRCS}) -add_dependencies(flaky msg sal) -set_target_properties(flaky PROPERTIES LINK_FLAGS "${HOST_LDFLAGS} -m32") - -target_link_libraries(flaky ${IMPERAS_VMISTUBS} ${LIBRARY_OUTPUT_PATH}/libsal.a) +add_dependencies(fail-flaky fail-comm fail-sal) +set_target_properties(fail-flaky PROPERTIES LINK_FLAGS "${HOST_LDFLAGS} -m32") +target_link_libraries(fail-flaky ${IMPERAS_VMISTUBS} ${LIBRARY_OUTPUT_PATH}/libsal.a) diff --git a/simulators/ovp/statusmsg/CMakeLists.txt b/simulators/ovp/statusmsg/CMakeLists.txt index a5579e2b..a3ecdadf 100644 --- a/simulators/ovp/statusmsg/CMakeLists.txt +++ b/simulators/ovp/statusmsg/CMakeLists.txt @@ -11,5 +11,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS} ) ## Build library -add_library(ovpstatusmessages ${PROTO_SRCS} ${PROTO_HDRS} ) - +add_library(fail-ovpstatusmessages ${PROTO_SRCS} ${PROTO_HDRS} ) diff --git a/simulators/ovp/test1/CMakeLists.txt b/simulators/ovp/test1/CMakeLists.txt index 2886eb3e..d4766780 100644 --- a/simulators/ovp/test1/CMakeLists.txt +++ b/simulators/ovp/test1/CMakeLists.txt @@ -7,7 +7,7 @@ set(SRCS platform/platform.cpp ) add_executable(ovp ${SRCS}) -add_dependencies(ovp msg) +add_dependencies(ovp fail-comm) target_link_libraries(ovp ${SIM_LDFLAGS} ) ## OVP links all needed shared libraries via a runtimeloader set_target_properties(ovp PROPERTIES LINK_FLAGS " -m32 ") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7bee7219..dc5f0d28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,4 +33,8 @@ add_library(fail dummy.cc) ## -> the Fail* targets and user defined experiment targets # start/end-group: ld must iterate over these archives more than once to figure # out which objects are needed -target_link_libraries(fail -Wl,--start-group ${EXPERIMENTS_ACTIVATED} ${PLUGINS_ACTIVATED} sal cpn efw comm util -Wl,--end-group) +set(experiment_libraries "") +foreach(exp_or_plugin ${EXPERIMENTS_ACTIVATED} ${PLUGINS_ACTIVATED}) + set(experiment_libraries ${experiment_libraries} fail-${exp_or_plugin}) +endforeach(exp_or_plugin) +target_link_libraries(fail -Wl,--start-group ${experiment_libraries} fail-sal fail-cpn fail-efw fail-comm fail-util -Wl,--end-group) diff --git a/src/core/comm/CMakeLists.txt b/src/core/comm/CMakeLists.txt index ab37bcc9..159679ce 100644 --- a/src/core/comm/CMakeLists.txt +++ b/src/core/comm/CMakeLists.txt @@ -16,5 +16,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) -add_library(comm ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS}) -target_link_libraries(comm ${PROTOBUF_LIBRARY}) +add_library(fail-comm ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS}) +target_link_libraries(fail-comm ${PROTOBUF_LIBRARY}) diff --git a/src/core/cpn/CMakeLists.txt b/src/core/cpn/CMakeLists.txt index 33576cec..777aa7aa 100644 --- a/src/core/cpn/CMakeLists.txt +++ b/src/core/cpn/CMakeLists.txt @@ -3,6 +3,6 @@ set(SRCS JobServer.cc ) -add_library(cpn ${SRCS}) +add_library(fail-cpn ${SRCS}) -add_dependencies(cpn comm) +add_dependencies(fail-cpn fail-comm) diff --git a/src/core/efw/CMakeLists.txt b/src/core/efw/CMakeLists.txt index b746d30e..939e6633 100644 --- a/src/core/efw/CMakeLists.txt +++ b/src/core/efw/CMakeLists.txt @@ -6,10 +6,10 @@ set(SRCS JobClient.cc ) -add_library(efw ${SRCS}) -add_dependencies(efw comm) +add_library(fail-efw ${SRCS}) +add_dependencies(fail-efw fail-comm) find_package(LibPCL REQUIRED) include_directories(${LIBPCL_INCLUDE_DIRS}) link_directories(${LIBPCL_LINK_DIRS}) -target_link_libraries(efw ${LIBPCL_LIBRARIES}) +target_link_libraries(fail-efw ${LIBPCL_LIBRARIES}) diff --git a/src/core/sal/CMakeLists.txt b/src/core/sal/CMakeLists.txt index 94020fcf..fc6f95ad 100644 --- a/src/core/sal/CMakeLists.txt +++ b/src/core/sal/CMakeLists.txt @@ -33,6 +33,6 @@ elseif(BUILD_OVP) ) endif(BUILD_BOCHS) -add_library(sal ${SRCS}) +add_library(fail-sal ${SRCS}) -add_dependencies(sal efw) +add_dependencies(fail-sal fail-efw) diff --git a/src/core/sal/gem5/SConscript b/src/core/sal/gem5/SConscript index a328e1cc..362ac8d2 100644 --- a/src/core/sal/gem5/SConscript +++ b/src/core/sal/gem5/SConscript @@ -7,7 +7,7 @@ env.Prepend(CPPPATH=Dir('../../../../../src/core/')) env.Prepend(CPPPATH=Dir('../../../../../build/src/core/')) env.Prepend(LIBPATH=Dir('../../../../../build/lib/')) -gStaticLibs = ['-lsal', '-lhsc-simple', '-lcomm', '-lcpn', '-lefw', '-lutil', '-lpcl'] +gStaticLibs = ['-lfail-sal', '-lfail-hsc-simple', '-lfail-comm', '-lfail-cpn', '-lfail-efw', '-lfail-util', '-lpcl'] if (len(gStaticLibs)>0): linkFlags = ['-Wl,--start-group'] diff --git a/src/core/util/CMakeLists.txt b/src/core/util/CMakeLists.txt index 6636fd95..9473fd9c 100644 --- a/src/core/util/CMakeLists.txt +++ b/src/core/util/CMakeLists.txt @@ -24,5 +24,5 @@ find_package(Boost 1.42 COMPONENTS thread REQUIRED) include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) -add_library(util ${SRCS}) -target_link_libraries(util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +add_library(fail-util ${SRCS}) +target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) diff --git a/src/experiments/checksum-oostubs/CMakeLists.txt b/src/experiments/checksum-oostubs/CMakeLists.txt index 6f41100e..e4eb3f5e 100644 --- a/src/experiments/checksum-oostubs/CMakeLists.txt +++ b/src/experiments/checksum-oostubs/CMakeLists.txt @@ -24,10 +24,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) -add_dependencies(${EXPERIMENT_NAME} tracing) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) -target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/cool-checksum/CMakeLists.txt b/src/experiments/cool-checksum/CMakeLists.txt index 7ab8cf08..601e391c 100644 --- a/src/experiments/cool-checksum/CMakeLists.txt +++ b/src/experiments/cool-checksum/CMakeLists.txt @@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) -target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/ecos_kernel_test/CMakeLists.txt b/src/experiments/ecos_kernel_test/CMakeLists.txt index 9fd21905..7f6eccf4 100644 --- a/src/experiments/ecos_kernel_test/CMakeLists.txt +++ b/src/experiments/ecos_kernel_test/CMakeLists.txt @@ -24,10 +24,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) -add_dependencies(${EXPERIMENT_NAME} tracing) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) -target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/fault-coverage/CMakeLists.txt b/src/experiments/fault-coverage/CMakeLists.txt index 93c43971..b0356a3a 100644 --- a/src/experiments/fault-coverage/CMakeLists.txt +++ b/src/experiments/fault-coverage/CMakeLists.txt @@ -15,4 +15,4 @@ set(MY_EXPERIMENT_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## build library -add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) diff --git a/src/experiments/fire-interrupt/CMakeLists.txt b/src/experiments/fire-interrupt/CMakeLists.txt index 36414e8d..457eb1ef 100644 --- a/src/experiments/fire-interrupt/CMakeLists.txt +++ b/src/experiments/fire-interrupt/CMakeLists.txt @@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## build library -add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) diff --git a/src/experiments/hsc-simple/CMakeLists.txt b/src/experiments/hsc-simple/CMakeLists.txt index 57b4ffd0..26450fdb 100644 --- a/src/experiments/hsc-simple/CMakeLists.txt +++ b/src/experiments/hsc-simple/CMakeLists.txt @@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## build library -add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) diff --git a/src/experiments/l4-sys/CMakeLists.txt b/src/experiments/l4-sys/CMakeLists.txt index a2240579..5a512602 100644 --- a/src/experiments/l4-sys/CMakeLists.txt +++ b/src/experiments/l4-sys/CMakeLists.txt @@ -27,14 +27,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) find_package(LibUdis86 REQUIRED) include_directories(${LIBUDIS86_INCLUDE_DIRS}) link_directories(${LIBUDIS86_LINK_DIRS}) -target_link_libraries(${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES}) +target_link_libraries(fail-${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES}) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) -target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/mh-test-campaign/CMakeLists.txt b/src/experiments/mh-test-campaign/CMakeLists.txt index 7442e03f..5e3e310d 100644 --- a/src/experiments/mh-test-campaign/CMakeLists.txt +++ b/src/experiments/mh-test-campaign/CMakeLists.txt @@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server mhcampaign.cc) -target_link_libraries(${EXPERIMENT_NAME}-server fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +target_link_libraries(fail-${EXPERIMENT_NAME}-server fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/regression-test/CMakeLists.txt b/src/experiments/regression-test/CMakeLists.txt index 83217ab3..23586b5f 100644 --- a/src/experiments/regression-test/CMakeLists.txt +++ b/src/experiments/regression-test/CMakeLists.txt @@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## build library -add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) diff --git a/src/experiments/tracing-test/CMakeLists.txt b/src/experiments/tracing-test/CMakeLists.txt index 5cd1ebb7..fe8c210f 100644 --- a/src/experiments/tracing-test/CMakeLists.txt +++ b/src/experiments/tracing-test/CMakeLists.txt @@ -12,6 +12,6 @@ set(MY_CAMPAIGN_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) -add_dependencies(${EXPERIMENT_NAME} tracing) +add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing) diff --git a/src/experiments/vezs-example/CMakeLists.txt b/src/experiments/vezs-example/CMakeLists.txt index fbca0b39..9500e654 100644 --- a/src/experiments/vezs-example/CMakeLists.txt +++ b/src/experiments/vezs-example/CMakeLists.txt @@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) #PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) ## This is the example's campaign server distributing experiment parameters #add_executable(${EXPERIMENT_NAME}-server main.cc) -#target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +#target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) #install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/experiments/weather-monitor/CMakeLists.txt b/src/experiments/weather-monitor/CMakeLists.txt index 88b483bb..a487b9f9 100644 --- a/src/experiments/weather-monitor/CMakeLists.txt +++ b/src/experiments/weather-monitor/CMakeLists.txt @@ -25,11 +25,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library -add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) +add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) -add_dependencies(${EXPERIMENT_NAME} tracing) +add_dependencies(${EXPERIMENT_NAME} fail-tracing) ## This is the example's campaign server distributing experiment parameters add_executable(${EXPERIMENT_NAME}-server main.cc) -target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) +target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin) diff --git a/src/plugins/serialoutput/CMakeLists.txt b/src/plugins/serialoutput/CMakeLists.txt index 441b040f..2f0b8219 100644 --- a/src/plugins/serialoutput/CMakeLists.txt +++ b/src/plugins/serialoutput/CMakeLists.txt @@ -7,4 +7,4 @@ set(MY_PLUGIN_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## Build library -add_library(${PLUGIN_NAME} ${MY_PLUGIN_SRCS}) +add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS}) diff --git a/src/plugins/tracing/CMakeLists.txt b/src/plugins/tracing/CMakeLists.txt index 5cd43761..011c5cdc 100644 --- a/src/plugins/tracing/CMakeLists.txt +++ b/src/plugins/tracing/CMakeLists.txt @@ -15,4 +15,4 @@ set(MY_PLUGIN_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) ## Build library -add_library(${PLUGIN_NAME} ${MY_PLUGIN_SRCS} ${PROTO_SRCS} ${PROTO_HDRS}) +add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS} ${PROTO_SRCS} ${PROTO_HDRS})