Task #5912: Added simple wrapper to target_link_libraries() in MAC/APL for its...

Task #5912: Added simple wrapper to target_link_libraries() in MAC/APL for its subpackages, which use target_link_libraries() quite often.

MAC/APL/CMakeLists.txt

@@ -5,6 +5,14 @@
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
   ${CMAKE_BINARY_DIR}/include/APL)
 
+macro(apl_target_link_libraries _target)
+  if(${CMAKE_VERSION} VERSION_LESS 2.8.12)
+    target_link_libraries(${_target} ${ARGN})
+  else()
+    target_link_libraries(${_target} PRIVATE ${ARGN})
+  endif()
+endmacro()
+
 lofar_add_package(APLCommon)       # Common tasks and functions
 lofar_add_package(RTCCommon)       # Real Time Control functions
 lofar_add_package(RTDBCommon)      # RealTimeDataBase common software

MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt

@@ -17,11 +17,16 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 # Add current source directory to -I path.
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+lofar_add_library(tp_protocol
+  TP_Protocol.cc
+  RawEvent.cc)
+  
+add_dependencies(tp_protocol TBB_Driver-TP_Protocol)
+
 lofar_add_library(tbbdriver
   Package__Version.cc
   DriverSettings.cc
-  TP_Protocol.cc
-  RawEvent.cc
+  TP_Protocol.ph
   Command.cc
   AllocCmd.cc
   BoardCmdHandler.cc
@@ -61,6 +66,8 @@ lofar_add_library(tbbdriver
   WatchDogCmd.cc
   TempLimitCmd.cc)
 
+apl_target_link_libraries(tbbdriver tp_protocol)
+
 lofar_add_bin_program(versiontbb_driver versiontbb_driver.cc)
 lofar_add_bin_program(tbbctl tbbctl.cc)
 lofar_add_bin_program(TBBDriver TBBDriver.cc)

MAC/APL/StationCU/src/ClockControl/CMakeLists.txt

@@ -4,7 +4,7 @@
 include_directories(${PACKAGE_BINARY_DIR}/src/ClockProtocol)
 
 lofar_add_bin_program(ClockControl ClockControlMain.cc ClockControl.cc)
-target_link_libraries(ClockControl clock_protocol)
+apl_target_link_libraries(ClockControl clock_protocol)
 
 lofar_add_bin_program(clkctl clkctl.cc)
-target_link_libraries(clkctl clock_protocol)
+apl_target_link_libraries(clkctl clock_protocol)

MAC/APL/StationCU/src/StationControl/CMakeLists.txt

@@ -8,7 +8,7 @@ lofar_add_bin_program(StationControl
   StationControl.cc
   ActiveObs.cc)
 
-target_link_libraries(StationControl clock_protocol)
+apl_target_link_libraries(StationControl clock_protocol)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/StationControl.conf.in