Bug 1310: A lot of new stuff; not yet complete. First MAC packages now also build successfully.

.gitattributes

@@ -274,7 +274,6 @@ LCS/Blob/test/tBlobField.in_be -text svneol=unset#unset
 LCS/Blob/test/tBlobField.in_le -text svneol=unset#unset
 LCS/Blob/test/tBlobStream.in_be -text svneol=unset#unset
 LCS/Blob/test/tBlobStream.in_le -text svneol=unset#unset
-LCS/CMakeLists.txt -text
 LCS/Common/config.h.cmake -text
 LCS/Common/src/Common-Model.cat -text
 LCS/LACE/bootstrap -text
@@ -471,7 +470,6 @@ MAC/GCF/RTDB/test/readScript.ctl -text
 MAC/GCF/RTDB/test/writeScript.ctl -text
 MAC/GCF/TM/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/TM/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/TM/src/Makefile.am -text svneol=native#application/octet-stream
 MAC/GCF/TM/test/Echo_Protocol.prot -text svneol=native#application/octet-stream
 MAC/GCF/TM/test/tGCFTask1.cc -text
 MAC/GCF/TM/test/tGCFTask2.cc -text
@@ -997,7 +995,6 @@ MAC/_System/lofar30.sysconf -text svneol=native#application/octet-stream
 MAC/bootstrap -text svneol=native#application/octet-stream
 MAC/lofarconf.in -text svneol=native#application/octet-stream
 RTCP/CNProc/bootstrap -text
-RTCP/CNProc/lofar_config.h.cmake -text
 RTCP/CNProc/src/ArenaMapping.h -text
 RTCP/CNProc/src/BeamFormer.cc -text
 RTCP/CNProc/src/BeamFormer.h -text
@@ -1010,9 +1007,7 @@ RTCP/CNProc/src/PencilBeams.h -text
 RTCP/CNProc/src/Stokes.cc -text
 RTCP/CNProc/src/Stokes.h -text
 RTCP/FCNP/bootstrap -text
-RTCP/FCNP/lofar_config.h.cmake -text
 RTCP/IONProc/bootstrap -text
-RTCP/IONProc/lofar_config.h.cmake -text
 RTCP/IONProc/test/CMakeLists.txt -text
 RTCP/IONProc/test/Makefile.am -text
 RTCP/IONProc/test/tDelayCompensation.cc -text
@@ -1025,7 +1020,6 @@ RTCP/Interface/include/Interface/PencilCoordinates.h -text
 RTCP/Interface/include/Interface/PipelineOutput.h -text
 RTCP/Interface/include/Interface/StokesData.h -text
 RTCP/Interface/include/Interface/StreamableData.h -text
-RTCP/Interface/lofar_config.h.cmake -text
 RTCP/Interface/src/CN_Mode.cc -text
 RTCP/Interface/src/PencilCoordinates.cc -text
 RTCP/LofarStMan/bootstrap -text
@@ -1056,7 +1050,6 @@ RTCP/Storage/include/Storage/MSWriterFile.h -text
 RTCP/Storage/include/Storage/MSWriterNull.h -text
 RTCP/Storage/include/Storage/MeasurementSetFormat.h -text
 RTCP/Storage/include/Storage/RTStorage.h -text
-RTCP/Storage/lofar_config.h.cmake -text
 RTCP/Storage/src/Format.cc -text
 RTCP/Storage/src/MSWriterCasa.cc -text
 RTCP/Storage/src/MSWriterFile.cc -text
@@ -1446,7 +1439,6 @@ autoconf_share/variants.bgfen0 -text
 autoconf_share/variants.frontend-4 -text
 autoconf_share/variants.kis001 -text
 autoconf_share/variants.lioffen -text
-/config.h.cmake -text
 doc/UML/CPA-Packages-Model.mdl -text
 doc/papers/2008/IEEE-SIG/LBA_calibrated.png -text
 doc/papers/2008/IEEE-SIG/LBA_observed.png -text

CEP/CMakeLists.txt

@@ -34,14 +34,14 @@ include(LofarGeneral)
 ## ---------------------------------------------------------------------------
 ## Subdirectories
 ## ---------------------------------------------------------------------------
-add_subdirectory(MWCommon)
-add_subdirectory(MS)
-add_subdirectory(ParmDB)
-add_subdirectory(Calibration)
-#add_subdirectory(DP3)
-#add_subdirectory(Imager)
-#add_subdirectory(Pipeline)
-#add_subdirectory(pyparmdb)
+lofar_add_subdirectory(MWCommon)
+lofar_add_subdirectory(MS)
+lofar_add_subdirectory(ParmDB)
+lofar_add_subdirectory(Calibration)
+lofar_add_subdirectory(DP3)
+lofar_add_subdirectory(Imager)
+lofar_add_subdirectory(Pipeline)
+#lofar_add_subdirectory(pyparmdb)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.

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

@@ -62,3 +62,6 @@ 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/BBSControl/src/CMakeLists.txt

@@ -64,7 +64,7 @@ set(bbscontrol_PROGRAMS
 lofar_add_library(bbscontrol ${bbscontrol_LIB_SRCS})
 
 foreach(prog ${bbscontrol_PROGRAMS})
-  lofar_add_executable(${prog} ${prog}.cc)
+  lofar_add_bin_program(${prog} ${prog}.cc)
 endforeach(prog ${bbscontrol_PROGRAMS})
 
 install(PROGRAMS

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

@@ -89,3 +89,6 @@ 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/src/CMakeLists.txt

@@ -84,5 +84,5 @@ set(bbskernel_PROGRAMS
 lofar_add_library(bbskernel ${bbskernel_LIB_SRCS})
 
 foreach(prog ${bbskernel_PROGRAMS})
-  lofar_add_executable(${prog} ${prog}.cc)
+  lofar_add_bin_program(${prog} ${prog}.cc)
 endforeach(prog ${bbskernel_PROGRAMS})

CEP/Calibration/CMakeLists.txt

@@ -34,8 +34,8 @@ include(LofarGeneral)
 ## ---------------------------------------------------------------------------
 ## Subdirectories
 ## ---------------------------------------------------------------------------
-add_subdirectory(BBSKernel)
-add_subdirectory(BBSControl)
+lofar_add_subdirectory(BBSKernel)
+lofar_add_subdirectory(BBSControl)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.

CEP/DP3/CMakeLists.txt

@@ -34,8 +34,8 @@ include(LofarGeneral)
 ## ---------------------------------------------------------------------------
 ## Subdirectories
 ## ---------------------------------------------------------------------------
-add_subdirectory(DPPP)
-add_subdirectory(SPWCombine)
+lofar_add_subdirectory(DPPP)
+lofar_add_subdirectory(SPWCombine)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.

CEP/DP3/DPPP/CMakeLists.txt

@@ -32,7 +32,7 @@ project(DPPP)
 include(LofarGeneral)
 
 include(LofarAddPackage)
-lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common PLC)
+lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common MS PLC)
 
 ## ---------------------------------------------------------------------------
 ## External packages
@@ -48,6 +48,6 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 ## Subdirectories
 ## ---------------------------------------------------------------------------
-add_subdirectory(include/CS1_pp_lib)
+add_subdirectory(include/DPPP)
 add_subdirectory(src)
 add_subdirectory(test)

CEP/DP3/DPPP/src/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 include(LofarPackageVersion)
 
-set(dppp_LIB_SRCS
+lofar_add_library(dppp
   Package__Version.cc
   FlaggerStatistics.cc
   MsInfo.cc
@@ -35,12 +35,5 @@ set(dppp_LIB_SRCS
   RunDetails.cc
   Pipeline.cc)
 
-set(dppp_PROGRAMS
-  versioncs1_pp_lib
-  CS1_IDPPP
-)
-
-lofar_add_library(dppp ${dppp_LIB_SRCS})
-
-lofar_add_executable(CS1_IDPPP IDPPP.cc PipelineProcessControl.cc)
-lofar_add_executable(versioncs1_pp_lib versiondppp.cc)
+lofar_add_bin_program(CS1_IDPPP IDPPP.cc PipelineProcessControl.cc)
+lofar_add_bin_program(versiondppp versiondppp.cc)

CEP/Imager/CMakeLists.txt

@@ -34,8 +34,8 @@ include(LofarGeneral)
 ## ---------------------------------------------------------------------------
 ## Subdirectories
 ## ---------------------------------------------------------------------------
-add_subdirectory(MWControl)
-#add_subdirectory(MWImager)
+lofar_add_subdirectory(MWControl)
+lofar_add_subdirectory(MWImager)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.

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

@@ -39,3 +39,6 @@ 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/src/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 include(LofarPackageVersion)
 
-set(mwcontrol_LIB_SRCS
+lofar_add_library(mwcontrol
   Package__Version.cc
   MWGlobalSpec.cc
   MWLocalSpec.cc
@@ -33,6 +33,4 @@ set(mwcontrol_LIB_SRCS
   SolverBBS.cc
   SolverProxy.cc)
 
-lofar_add_library(mwcontrol ${mwcontrol_LIB_SRCS})
-
-lofar_add_executable(versionmwcontrol versionmwcontrol.cc)
+lofar_add_bin_program(versionmwcontrol versionmwcontrol.cc)

CEP/MS/include/MS/CMakeLists.txt

@@ -30,3 +30,6 @@ 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/src/CMakeLists.txt

@@ -36,7 +36,7 @@ set(ms_PROGRAMS
 lofar_add_library(ms ${ms_LIB_SRCS})
 
 foreach(prog ${ms_PROGRAMS})
-  lofar_add_executable(${prog} ${prog}.cc)
+  lofar_add_bin_program(${prog} ${prog}.cc)
 endforeach(prog ${ms_PROGRAMS})
 
 install(PROGRAMS

CEP/MWCommon/include/MWCommon/CMakeLists.txt

@@ -63,3 +63,6 @@ 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/src/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 include(LofarPackageVersion)
 
-set(mwcommon_LIB_SRCS
+lofar_add_library(mwcommon
   Package__Version.cc
   ClusterDesc.cc
   ControllerBase.cc
@@ -55,10 +55,8 @@ set(mwcommon_LIB_SRCS
   WorkerProxy.cc
   WorkersDesc.cc)
 
-lofar_add_library(mwcommon ${mwcommon_LIB_SRCS})
-
-lofar_add_executable(versionmwcommon versionmwcommon.cc)
-lofar_add_executable(finddproc finddproc.cc)
+lofar_add_bin_program(versionmwcommon versionmwcommon.cc)
+lofar_add_bin_program(finddproc finddproc.cc)
 
 install(PROGRAMS
   startdistproc

CEP/ParmDB/include/ParmDB/CMakeLists.txt

@@ -49,3 +49,6 @@ 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/src/CMakeLists.txt

@@ -51,7 +51,7 @@ set(parmdb_PROGRAMS
 lofar_add_library(parmdb ${parmdb_LIB_SRCS})
 
 foreach(prog ${parmdb_PROGRAMS})
-  lofar_add_executable(${prog} ${prog}.cc)
+  lofar_add_bin_program(${prog} ${prog}.cc)
 endforeach(prog ${parmdb_PROGRAMS})
 
 install(PROGRAMS

CMake/FindBacktrace.cmake

@@ -34,7 +34,6 @@ include(CheckIncludeFile)
 include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(FindPackageHandleStandardArgs)
-include(LofarMacros)
 
 if(NOT BACKTRACE_FOUND)
   set(BACKTRACE_LIBRARIES)
@@ -48,20 +47,21 @@ if(NOT BACKTRACE_FOUND)
         if(BFD_LIBRARY)
           set(HAVE_BFD 1 CACHE INTERNAL "Have bfd library")
           list(APPEND BACKTRACE_LIBRARIES ${BFD_LIBRARY})
-          check_include_file(demangle.h HAVE_DEMANGLE_H)
-          if(HAVE_DEMANGLE_H)
-            find_library(IBERTY_LIBRARY iberty)
-            set(CMAKE_REQUIRED_LIBRARIES ${IBERTY_LIBRARY})
-            check_function_exists(cplus_demangle HAVE_CPLUS_DEMANGLE)
-            if(HAVE_CPLUS_DEMANGLE)
-              list(APPEND BACKTRACE_LIBRARIES ${IBERTY_LIBRARY})
-            endif(HAVE_CPLUS_DEMANGLE)
-          endif(HAVE_DEMANGLE_H)
+          find_library(IBERTY_LIBRARY iberty)
+          if(IBERTY_LIBRARY)
+            list(APPEND BACKTRACE_LIBRARIES ${IBERTY_LIBRARY})
+            check_include_file(demangle.h HAVE_DEMANGLE_H)
+            if(HAVE_DEMANGLE_H)
+              set(CMAKE_REQUIRED_LIBRARIES ${IBERTY_LIBRARY})
+              check_function_exists(cplus_demangle HAVE_CPLUS_DEMANGLE)
+            endif(HAVE_DEMANGLE_H)
+          endif(IBERTY_LIBRARY)
+          # Newer version of libbfd also depend on libz.
+          find_library(Z_LIBRARY z)
+          if(Z_LIBRARY)
+            list(APPEND BACKTRACE_LIBRARIES ${Z_LIBRARY})
+          endif(Z_LIBRARY)
         endif(BFD_LIBRARY)
-        # Newer version fo libbfd also depend on libz. We need to specify libz
-        # explicity when linking statically.
-        find_library(Z_LIBRARY z)
-        list_append_if(Z_LIBRARY BACKTRACE_LIBRARIES ${Z_LIBRARY})
       endif(HAVE_BFD_H)
     endif(HAVE_BACKTRACE)
   endif(HAVE_EXECINFO_H)