From f9002d13e02b4765ca0ad0ecd6d4d0ac4ade6fe2 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 8 Aug 2014 13:37:30 +0000
Subject: [PATCH] Task #5921: Removed extra tp_protocol library, merged it with
the tbbdriver library; problematic target_link_libraries() statement could
then be removed.
---
MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt b/MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt
index 5cb2f6f5b54..095333dfb94 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt
+++ b/MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt
@@ -17,16 +17,11 @@ 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.ph
+ TP_Protocol.cc
+ RawEvent.cc
Command.cc
AllocCmd.cc
BoardCmdHandler.cc
@@ -66,8 +61,6 @@ lofar_add_library(tbbdriver
WatchDogCmd.cc
TempLimitCmd.cc)
-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)
--
GitLab