From c1276f7a02642c85f606ff08f096a713f3e379f1 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Wed, 8 Jul 2009 15:23:35 +0000
Subject: [PATCH] Bug 1310: Moved preprocessor definition to project-root
 CMakeLists.txt files. Fixed some small issues.

---
 .gitattributes                           | 1 -
 MAC/APL/APLCommon/CMakeLists.txt         | 5 +++++
 MAC/APL/APLCommon/src/CMakeLists.txt     | 3 ---
 MAC/APL/CUDaemons/CMakeLists.txt         | 5 +++++
 MAC/APL/CUDaemons/src/CMakeLists.txt     | 3 ---
 MAC/APL/CURTDBDaemons/CMakeLists.txt     | 5 +++++
 MAC/APL/CURTDBDaemons/src/CMakeLists.txt | 3 ---
 MAC/APL/MainCU/CMakeLists.txt            | 5 +++++
 MAC/APL/MainCU/src/CMakeLists.txt        | 3 ---
 MAC/APL/PAC/CMakeLists.txt               | 6 +++---
 MAC/APL/lofarconf.in                     | 1 +
 11 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 4bd57609e3d..85968ad236f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -355,7 +355,6 @@ MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h -text
 MAC/APL/StationCU/src/TBBControl/TBBObservation.cc -text
 MAC/APL/StationCU/src/TBBControl/TBBObservation.h -text
 MAC/APL/TestSuite/bootstrap -text svneol=native#application/octet-stream
-MAC/APL/lofarconf.in -text svneol=native#application/octet-stream
 MAC/Config/Apc/b1.apc -text svneol=native#application/octet-stream
 MAC/Config/Apc/b2.apc -text svneol=native#application/octet-stream
 MAC/Config/Apc/d1.apc -text svneol=native#application/octet-stream
diff --git a/MAC/APL/APLCommon/CMakeLists.txt b/MAC/APL/APLCommon/CMakeLists.txt
index 21e135cfd1d..d5cd7c59306 100644
--- a/MAC/APL/APLCommon/CMakeLists.txt
+++ b/MAC/APL/APLCommon/CMakeLists.txt
@@ -40,6 +40,11 @@ lofar_add_package(${PROJECT_NAME} 3.1 DEPENDS Common ApplCommon GCFTM MACIO)
 include(LofarFindPackage)
 lofar_find_package(Boost REQUIRED COMPONENTS regex)
 
+## ---------------------------------------------------------------------------
+## Project-specific compiler definitions.
+## ---------------------------------------------------------------------------
+add_definitions(-DBOOST_DISABLE_THREADS)
+
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.
 ## ---------------------------------------------------------------------------
diff --git a/MAC/APL/APLCommon/src/CMakeLists.txt b/MAC/APL/APLCommon/src/CMakeLists.txt
index ce390872ff3..5cdbc048080 100644
--- a/MAC/APL/APLCommon/src/CMakeLists.txt
+++ b/MAC/APL/APLCommon/src/CMakeLists.txt
@@ -20,9 +20,6 @@
 
 include(LofarPackageVersion)
 
-# Extra preprocessor definitions
-#add_definitions(-DBOOST_DISABLE_THREADS)
-
 # Add MAC protocols (generates a .ph and .cc file from a .prot file)
 include(MACAddProtocol)
 mac_add_protocol(Controller_Protocol "${MACIO_SOURCE_DIR}/autogen")
diff --git a/MAC/APL/CUDaemons/CMakeLists.txt b/MAC/APL/CUDaemons/CMakeLists.txt
index 5430577bd70..7c3ab49b8fc 100644
--- a/MAC/APL/CUDaemons/CMakeLists.txt
+++ b/MAC/APL/CUDaemons/CMakeLists.txt
@@ -41,6 +41,11 @@ lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common ApplCommon APLCommon GCFTM
 include(LofarFindPackage)
 lofar_find_package(Log4Cplus REQUIRED)
 
+## ---------------------------------------------------------------------------
+## Project-specific compiler definitions.
+## ---------------------------------------------------------------------------
+add_definitions(-DBOOST_DISABLE_THREADS)
+
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.
 ## ---------------------------------------------------------------------------
diff --git a/MAC/APL/CUDaemons/src/CMakeLists.txt b/MAC/APL/CUDaemons/src/CMakeLists.txt
index a954d031ca8..b2d30766a47 100644
--- a/MAC/APL/CUDaemons/src/CMakeLists.txt
+++ b/MAC/APL/CUDaemons/src/CMakeLists.txt
@@ -20,9 +20,6 @@
 
 include(LofarPackageVersion)
 
-# Extra preprocessor definitions
-#add_definitions(-DBOOST_DISABLE_THREADS)
-
 # Create symbolic link in binary include directory to current directory.
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/MAC/APL/CURTDBDaemons/CMakeLists.txt b/MAC/APL/CURTDBDaemons/CMakeLists.txt
index e8ae8675906..fc7c6c40c3f 100644
--- a/MAC/APL/CURTDBDaemons/CMakeLists.txt
+++ b/MAC/APL/CURTDBDaemons/CMakeLists.txt
@@ -41,6 +41,11 @@ include(LofarFindPackage)
 lofar_find_package(Boost REQUIRED COMPONENTS date_time)
 lofar_find_package(PQXX REQUIRED)
 
+## ---------------------------------------------------------------------------
+## Project-specific compiler definitions.
+## ---------------------------------------------------------------------------
+add_definitions(-DBOOST_DISABLE_THREADS)
+
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.
 ## ---------------------------------------------------------------------------
diff --git a/MAC/APL/CURTDBDaemons/src/CMakeLists.txt b/MAC/APL/CURTDBDaemons/src/CMakeLists.txt
index c55a649d8fa..caa60dfb4e7 100644
--- a/MAC/APL/CURTDBDaemons/src/CMakeLists.txt
+++ b/MAC/APL/CURTDBDaemons/src/CMakeLists.txt
@@ -20,9 +20,6 @@
 
 include(LofarPackageVersion)
 
-# Extra preprocessor definitions
-#add_definitions(-DBOOST_DISABLE_THREADS)
-
 # Create symbolic link in binary include directory to current directory.
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/MAC/APL/MainCU/CMakeLists.txt b/MAC/APL/MainCU/CMakeLists.txt
index f78a14d1610..d7d7ad21d77 100644
--- a/MAC/APL/MainCU/CMakeLists.txt
+++ b/MAC/APL/MainCU/CMakeLists.txt
@@ -41,6 +41,11 @@ lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common OTDB MACIO GCFTM GCFPVSS GC
 include(LofarFindPackage)
 lofar_find_package(Boost REQUIRED date_time)
 
+## ---------------------------------------------------------------------------
+## Project-specific compiler definitions.
+## ---------------------------------------------------------------------------
+add_definitions(-DBOOST_DISABLE_THREADS)
+
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.
 ## ---------------------------------------------------------------------------
diff --git a/MAC/APL/MainCU/src/CMakeLists.txt b/MAC/APL/MainCU/src/CMakeLists.txt
index 21702b078b4..6f126b55819 100644
--- a/MAC/APL/MainCU/src/CMakeLists.txt
+++ b/MAC/APL/MainCU/src/CMakeLists.txt
@@ -20,9 +20,6 @@
 
 include(LofarPackageVersion)
 
-# Extra preprocessor definitions
-#add_definitions(-DBOOST_DISABLE_THREADS)
-
 # Create symbolic link in binary include directory to current directory.
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/MAC/APL/PAC/CMakeLists.txt b/MAC/APL/PAC/CMakeLists.txt
index 60449be578f..0fd6d55085f 100644
--- a/MAC/APL/PAC/CMakeLists.txt
+++ b/MAC/APL/PAC/CMakeLists.txt
@@ -36,9 +36,9 @@ include(LofarGeneral)
 ## ---------------------------------------------------------------------------
 lofar_add_subdirectory(CAL_Protocol)
 lofar_add_subdirectory(BS_Protocol)
-lofar_add_subdirectory(CalServer)
-lofar_add_subdirectory(BeamServer)
-lofar_add_subdirectory(SHMInfoServer)
+lofar_add_subdirectory(Cal_Server)
+lofar_add_subdirectory(Beam_Server)
+lofar_add_subdirectory(SHMInfo_Server)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.
diff --git a/MAC/APL/lofarconf.in b/MAC/APL/lofarconf.in
index e43117ab906..a6b68cd144f 100644
--- a/MAC/APL/lofarconf.in
+++ b/MAC/APL/lofarconf.in
@@ -9,3 +9,4 @@ RTCCommon
 RTDBCommon
 StationCU
 TestCtlr
+TestSuite
-- 
GitLab