Bug 1310: Added CURTDBDaemons to CMake build.

MAC/APL/APLCommon/src/CMakeLists.txt

@@ -28,13 +28,6 @@ include(MACAddProtocol)
 mac_add_protocol(Controller_Protocol "${MACIO_SOURCE_DIR}/autogen")
 mac_add_protocol(StartDaemon_Protocol "${MACIO_SOURCE_DIR}/autogen")
 
-# Add current source directory to -I path. This is needed because APLCOMMON uses
-# angle brackets for internal header files, instead of quotes.
-#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-# Add the directory where the generated C++ headers are stored to the -I path.
-#include_directories(${CMAKE_BINARY_DIR}/include/MAC)
-
 lofar_add_library(aplcommon
   Package__Version.cc
   StartDaemon_Protocol.cc

MAC/APL/CEPCU/test/ApplController/CMakeLists.txt

@@ -20,9 +20,5 @@
 
 include(LofarCTest)
 
-# Add current binary directory to -I path, so that the generated C++ header
-# files can be found.
-#include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 lofar_add_test(APExample APExample.cc APCmdImpl.cc)
 lofar_add_test(APTest APTest.cc APCmdImpl.cc)

MAC/APL/CURTDBDaemons/CMakeLists.txt

@@ -32,13 +32,14 @@ project(CURTDBDaemons)
 include(LofarGeneral)
 
 include(LofarAddPackage)
-lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS APLCommon ApplCommon Common GCFPVSS GCFRTDB GCFTM MACIO OTDB RTDBCommon)
+lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common ApplCommon MACIO GCFTM GCFRTDB RTDBCommon APLCommon OTDB)
 
 ## ---------------------------------------------------------------------------
 ## External packages
 ## ---------------------------------------------------------------------------
 include(LofarFindPackage)
 lofar_find_package(Boost REQUIRED COMPONENTS date_time)
+lofar_find_package(PQXX REQUIRED)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.

MAC/APL/CURTDBDaemons/src/CMakeLists.txt

+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+include(LofarPackageVersion)
+
+# Create symbolic link in binary include directory to current directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include/CURTDBDaemons)
+
+lofar_add_library(curtdbdaemons Package__Version.cc)
+
+lofar_add_bin_program(versioncurtdbdaemons versioncurtdbdaemons.cc)
+
+add_subdirectory(LogProcessor)
+add_subdirectory(KeyValueLogger)
+add_subdirectory(SASGateway)
+add_subdirectory(SoftwareMonitor)

MAC/APL/CURTDBDaemons/src/KeyValueLogger/CMakeLists.txt

+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  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_bin_program(KeyValueLogger KeyValueLoggerMain.cc KeyValueLogger.cc)
+
+install(FILES KeyValueLogger.conf DESTINATION etc)

MAC/APL/CURTDBDaemons/src/LogProcessor/CMakeLists.txt

+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  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_bin_program(LogProcessor LogProcessorMain.cc LogProcessor.cc)
+
+install(FILES 
+  LogProcessor.conf
+  LogProcessor.log_prop
+  DESTINATION etc)

MAC/APL/CURTDBDaemons/src/SASGateway/CMakeLists.txt

+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  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_bin_program(SASGateway SASGatewayMain.cc SASGateway.cc)
+
+install(FILES SASGateway.conf DESTINATION etc)

MAC/APL/CURTDBDaemons/src/SoftwareMonitor/CMakeLists.txt

+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  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_bin_program(SoftwareMonitor SoftwareMonitorMain.cc SoftwareMonitor.cc)
+
+install(FILES SoftwareMonitor.conf DESTINATION etc)

MAC/APL/CURTDBDaemons/test/CMakeLists.txt

+#  $Id$
+#
+#  Copyright (C) 2008-2009
+#  ASTRON (Netherlands Foundation for Research in Astronomy)
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+include(LofarCTest)
+
+lofar_add_test(tLoggingProcessor tLoggingProcessor.cc)
+#lofar_add_test(tKeyValueLogger tKeyValueLogger.cc)