Bug 1310: Moved preprocessor definition to project-root CMakeLists.txt files.

Fixed some small issues.

.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

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.
 ## ---------------------------------------------------------------------------

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")

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.
 ## ---------------------------------------------------------------------------

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}

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.
 ## ---------------------------------------------------------------------------

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}

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.
 ## ---------------------------------------------------------------------------

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}

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.

MAC/APL/lofarconf.in

@@ -9,3 +9,4 @@ RTCCommon
 RTDBCommon
 StationCU
 TestCtlr
+TestSuite