Bug 1310:

* Added APLCommon to the CMake build.
* Use of INCLUDE_PATH_SUFFIX is now optional.
* Removed EXCLUDE_FROM_ALL from add_subdirectory(test).

CEP/Calibration/BBSControl/include/BBSControl/CMakeLists.txt

@@ -62,6 +62,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/Calibration/BBSKernel/include/BBSKernel/CMakeLists.txt

@@ -89,6 +89,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/DP3/DPPP/include/DPPP/CMakeLists.txt

@@ -41,6 +41,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/Imager/MWControl/include/MWControl/CMakeLists.txt

@@ -39,6 +39,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/Imager/MWImager/include/MWImager/CMakeLists.txt

@@ -31,5 +31,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
 
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/MS/include/MS/CMakeLists.txt

@@ -30,6 +30,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/MWCommon/include/MWCommon/CMakeLists.txt

@@ -63,6 +63,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

CEP/ParmDB/include/ParmDB/CMakeLists.txt

@@ -49,6 +49,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

LCS/ACC/ALC/CMakeLists.txt

@@ -49,4 +49,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/ALC)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)

LCS/ACC/ALC/include/ALC/CMakeLists.txt

@@ -18,6 +18,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

LCS/ACC/PLC/CMakeLists.txt

@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/PLC)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)

LCS/ACC/PLC/include/PLC/CMakeLists.txt

@@ -18,6 +18,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

LCS/AMC/AMCBase/CMakeLists.txt

@@ -49,4 +49,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/AMCBase)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)

LCS/AMC/AMCBase/include/AMCBase/CMakeLists.txt

@@ -23,6 +23,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

LCS/AMC/AMCImpl/CMakeLists.txt

@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/AMCImpl)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)

LCS/AMC/AMCImpl/include/AMCImpl/CMakeLists.txt

@@ -12,6 +12,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

LCS/ApplCommon/CMakeLists.txt

@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/ApplCommon)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)

LCS/ApplCommon/include/ApplCommon/CMakeLists.txt

@@ -30,7 +30,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
-
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX ${PROJECT_NAME} 
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

LCS/ApplCommon/src/CMakeLists.txt

@@ -22,7 +22,9 @@ include(LofarPackageVersion)
 
 lofar_add_library(applcommon
   Package__Version.cc
-  Observation.cc)
+  Observation.cc
+  StationConfig.cc
+  StationInfo.cc)
 
 lofar_add_bin_program(versionapplcommon versionapplcommon.cc)
 

LCS/Blob/CMakeLists.txt

@@ -50,4 +50,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/Blob)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)