Bug 1310: Resynchronized CMakeLists.txt files with Makefile.am files.

CEP/Calibration/BBSControl/CMakeLists.txt

@@ -53,4 +53,4 @@ include(LofarConfig)
 ## ---------------------------------------------------------------------------
 add_subdirectory(include/BBSControl)
 add_subdirectory(src)
-add_subdirectory(test)
+#add_subdirectory(test)    # test currently do NOT compile!

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

@@ -18,8 +18,13 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# List of header files that will be installed.
-set(inst_HEADERS
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME})
+
+# Install header files.
+install(FILES 
   AddStep.h
   BlobStreamableConnection.h
   CalSession.h
@@ -39,7 +44,6 @@ set(inst_HEADERS
   MessageHandlers.h
   MultiStep.h
   NextChunkCommand.h
-  NoiseStep.h
   PredictStep.h
   RecoverCommand.h
   RefitStep.h
@@ -52,12 +56,5 @@ set(inst_HEADERS
   Strategy.h
   SubtractStep.h
   SynchronizeCommand.h
-  Types.h)
-
-# Create symbolic link to include directory.
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME})
-
-# Install header files.
-install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})
+  Types.h
+  DESTINATION include/${PROJECT_NAME})

CEP/Calibration/BBSControl/src/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 include(LofarPackageVersion)
 
-set(bbscontrol_LIB_SRCS
+lofar_add_library(bbscontrol
   Package__Version.cc
   AddStep.cc
   BlobStreamableConnection.cc
@@ -39,7 +39,6 @@ set(bbscontrol_LIB_SRCS
   Messages.cc
   MultiStep.cc
   NextChunkCommand.cc
-  NoiseStep.cc
   PredictStep.cc
   RecoverCommand.cc
   RefitStep.cc
@@ -55,17 +54,10 @@ set(bbscontrol_LIB_SRCS
   SynchronizeCommand.cc
   Types.cc)
 
-set(bbscontrol_PROGRAMS
-  versionbbscontrol
-  GlobalControl
-  KernelControl
-  SolverControl)
-
-lofar_add_library(bbscontrol ${bbscontrol_LIB_SRCS})
-
-foreach(prog ${bbscontrol_PROGRAMS})
-  lofar_add_bin_program(${prog} ${prog}.cc)
-endforeach(prog ${bbscontrol_PROGRAMS})
+lofar_add_bin_program(versionbbscontrol versionbbscontrol.cc)
+lofar_add_bin_program(GlobalControl GlobalControl.cc)
+lofar_add_bin_program(KernelControl KernelControl.cc)
+lofar_add_bin_program(SolverControl SolverControl.cc)
 
 install(PROGRAMS
   calibrate

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

@@ -18,16 +18,19 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# List of header files that will be installed.
-set(inst_HEADERS
-  BlobIOExtensions.h
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME})
+
+# Install header files.
+install(FILES
   Evaluator.h
   Equator.h
   Exceptions.h
   Instrument.h
   Measurement.h
   MeasurementAIPS.h
-  MetaMeasurement.h
   Model.h
   ModelConfig.h
   ParmManager.h
@@ -78,13 +81,8 @@ set(inst_HEADERS
   Expr/ResultVec.h
   Expr/Pool.h
   Expr/Source.h
+  Expr/SpectralIndex.h
   Expr/StatUVW.h
-  Expr/YatawattaDipole.h)
+  Expr/YatawattaDipole.h
+  DESTINATION include/${PROJECT_NAME})
 
-# Create symbolic link to include directory.
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME})
-
-# Install header files.
-install(FILES ${inst_HEADERS} DESTINATION include/${PROJECT_NAME})

CEP/Calibration/BBSKernel/src/CMakeLists.txt

@@ -20,14 +20,11 @@
 
 include(LofarPackageVersion)
 
-set(bbskernel_LIB_SRCS
+lofar_add_library(bbskernel
   Package__Version.cc
-  BlobIOExtensions.cc
   Evaluator.cc
   Equator.cc
-  Instrument.cc
   MeasurementAIPS.cc
-  MetaMeasurement.cc
   Model.cc
   ModelConfig.cc
   ParmManager.cc
@@ -74,15 +71,8 @@ set(bbskernel_LIB_SRCS
   Expr/Result.cc
   Expr/ResultVec.cc
   Expr/Source.cc
+  Expr/SpectralIndex.cc
   Expr/StatUVW.cc
   Expr/YatawattaDipole.cc)
 
-set(bbskernel_PROGRAMS
-  versionbbskernel
-  metams)
-
-lofar_add_library(bbskernel ${bbskernel_LIB_SRCS})
-
-foreach(prog ${bbskernel_PROGRAMS})
-  lofar_add_bin_program(${prog} ${prog}.cc)
-endforeach(prog ${bbskernel_PROGRAMS})
+lofar_add_bin_program(versionbbskernel versionbbskernel.cc)

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

@@ -30,6 +30,7 @@ set(inst_HEADERS
   BandpassCorrector.h
   DataSquasher.h
   DataBuffer.h
+  TimeBuffer.h
   RunDetails.h
   Pipeline.h)
 

CEP/DP3/DPPP/src/CMakeLists.txt

@@ -32,6 +32,7 @@ lofar_add_library(dppp
   BandpassCorrector.cc
   DataSquasher.cc
   DataBuffer.cc
+  TimeBuffer.cc
   RunDetails.cc
   Pipeline.cc)
 

MAC/Tools/Clock/CMakeLists.txt

@@ -18,6 +18,8 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-lofar_add_sbin_program(ppsctl ppsctl.c)
+if(HAVE_SYS_TIMEPPS_H)
+  lofar_add_sbin_program(ppsctl ppsctl.c)
+endif(HAVE_SYS_TIMEPPS_H)
 
 install(PROGRAMS plotclock DESTINATION sbin)