cmake: static library dependencies

CMake does not support linker groups, which were used to "automatically" fix circular dependencies between different static FAIL* libraries and the ordering of dynamic external libraries broke linking. CMake can however correctly invoke the linker if dependencies are decribed correctly (even if circular). This required changing all add_dependencies calls between libraries to target_link_libraries (which creates a link-time dependency) and linking all experiments to fail-sal. Change-Id: I3a0d5dddb9b3d963ef538814e20d6b3de85d4ec5
2014-02-18 17:20:21 +01:00
parent 3cf2fa082f
commit 396e00ce59
22 changed files with 33 additions and 13 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -45,4 +45,4 @@ 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 fail-sal fail-cpn fail-efw fail-comm fail-util ${experiment_libraries} -Wl,-end-group)
+target_link_libraries(fail fail-sal fail-cpn fail-efw fail-comm fail-util ${experiment_libraries})
--- a/src/core/efw/CMakeLists.txt
+++ b/src/core/efw/CMakeLists.txt
@ -8,6 +8,7 @@ set(SRCS

 add_library(fail-efw ${SRCS})
 add_dependencies(fail-efw fail-comm)
+target_link_libraries(fail-efw fail-comm)

 find_package(LibPCL REQUIRED)
 include_directories(${LIBPCL_INCLUDE_DIRS})
--- a/src/core/sal/CMakeLists.txt
+++ b/src/core/sal/CMakeLists.txt
@ -102,4 +102,8 @@ endif(CONFIG_FAST_BREAKPOINTS)


 add_library(fail-sal ${SRCS})
-add_dependencies(fail-sal fail-efw)
+target_link_libraries(fail-sal fail-efw fail-util)
+
+foreach(exp ${EXPERIMENTS_ACTIVATED})
+	target_link_libraries(fail-sal fail-${exp})
+endforeach()
--- a/src/core/util/CMakeLists.txt
+++ b/src/core/util/CMakeLists.txt
@ -67,6 +67,7 @@ mark_as_advanced(FAIL_OBJDUMP)

 add_library(fail-util ${SRCS})
 add_dependencies(fail-util fail-comm)
+target_link_libraries(fail-util fail-comm)
 target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${LIB_IBERTY} ${ZLIB_LIBRARIES} dwarf elf)

 option(BUILD_LLVM_DISASSEMBLER "Build the LLVM-based disassembler (LLVM 3.3 preferred, for 3.1 and 3.2 read doc/how-to-build.txt)" OFF)
--- a/src/core/util/llvmdisassembler/CMakeLists.txt
+++ b/src/core/util/llvmdisassembler/CMakeLists.txt
@ -15,7 +15,7 @@ include(FindLLVM)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS} -fno-rtti" )

 add_library(fail-llvmdisassembler ${SRCS})
-add_dependencies(fail-llvmdisassembler fail-sal)
+target_link_libraries(fail-llvmdisassembler fail-sal)
 target_link_libraries(fail-llvmdisassembler ${LLVM_LIBS} ${LLVM_LDFLAGS} )

 ### Tests
--- a/src/experiments/checksum-oostubs/CMakeLists.txt
+++ b/src/experiments/checksum-oostubs/CMakeLists.txt
@ -25,7 +25,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/cool-checksum/CMakeLists.txt
+++ b/src/experiments/cool-checksum/CMakeLists.txt
@ -25,7 +25,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/cored-voter/CMakeLists.txt
+++ b/src/experiments/cored-voter/CMakeLists.txt
@ -26,6 +26,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY} fail-llvmdisassembler)

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/dciao-kernelstructs/CMakeLists.txt
+++ b/src/experiments/dciao-kernelstructs/CMakeLists.txt
@ -29,6 +29,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/ecos_kernel_test/CMakeLists.txt
+++ b/src/experiments/ecos_kernel_test/CMakeLists.txt
@ -29,7 +29,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY} ${MYSQL_LIBRARIES})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/ezs-logger/CMakeLists.txt
+++ b/src/experiments/ezs-logger/CMakeLists.txt
@ -16,5 +16,6 @@ set(MY_CAMPAIGN_SRCS
 ## Build library
 add_library(fail-${EXPERIMENT_NAME}  ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME})

--- a/src/experiments/generic-tracing/CMakeLists.txt
+++ b/src/experiments/generic-tracing/CMakeLists.txt
@ -14,4 +14,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
--- a/src/experiments/kesorefs/CMakeLists.txt
+++ b/src/experiments/kesorefs/CMakeLists.txt
@ -29,6 +29,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/l4-sys/CMakeLists.txt
+++ b/src/experiments/l4-sys/CMakeLists.txt
@ -38,6 +38,7 @@ find_package(LibUdis86 REQUIRED)
 include_directories(${LIBUDIS86_INCLUDE_DIRS})
 link_directories(${LIBUDIS86_LINK_DIRS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/mh-test-campaign/CMakeLists.txt
+++ b/src/experiments/mh-test-campaign/CMakeLists.txt
@ -26,6 +26,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/nanojpeg/CMakeLists.txt
+++ b/src/experiments/nanojpeg/CMakeLists.txt
@ -39,7 +39,8 @@ link_directories(${LIBUDIS86_LINK_DIRS})

 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/rampage/CMakeLists.txt
+++ b/src/experiments/rampage/CMakeLists.txt
@ -27,6 +27,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/tracing-test/CMakeLists.txt
+++ b/src/experiments/tracing-test/CMakeLists.txt
@ -14,4 +14,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing)
--- a/src/experiments/vezs-example/CMakeLists.txt
+++ b/src/experiments/vezs-example/CMakeLists.txt
@ -26,6 +26,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/weather-monitor-gem5/CMakeLists.txt
+++ b/src/experiments/weather-monitor-gem5/CMakeLists.txt
@ -26,7 +26,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/experiments/weather-monitor/CMakeLists.txt
+++ b/src/experiments/weather-monitor/CMakeLists.txt
@ -26,7 +26,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})

 ## This is the example's campaign server distributing experiment parameters
--- a/src/plugins/tracing/CMakeLists.txt
+++ b/src/plugins/tracing/CMakeLists.txt
@ -9,5 +9,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS})
 add_dependencies(fail-${PLUGIN_NAME} fail-comm)
-target_link_libraries(fail-${PLUGIN_NAME})
-
+target_link_libraries(fail-${PLUGIN_NAME} fail-sal fail-cpn fail-efw fail-comm)