Bug 1310: Added GCF/RTDB and fixed some problems with GCF/PVSS.

LCS/Common/include/Common/CMakeLists.txt

@@ -96,7 +96,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}\"")

MAC/GCF/PVSS/CMakeLists.txt

@@ -38,7 +38,7 @@ lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common GCFTM)
 ## External packages
 ## ---------------------------------------------------------------------------
 include(LofarFindPackage)
-lofar_find_package(PVSS)# REQUIRED)
+lofar_find_package(PVSS REQUIRED)
 
 ## ---------------------------------------------------------------------------
 ## Generate configuration header file.

MAC/GCF/PVSS/include/GCF/PVSS/CMakeLists.txt

@@ -38,6 +38,11 @@ set(inst_HEADERS
   PVSSresult.h
   PVSSservice.h)
 
+# Add definition of include path suffix definition, because the header files
+# reside in a non-standard location. 
+set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX GCF/PVSS
+  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
+
 # Create symbolic link to include directory.
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -45,6 +50,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/GCF/PVSS)
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX GCF/PVSS
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

MAC/GCF/PVSS/src/CMakeLists.txt

@@ -21,7 +21,11 @@
 include(LofarPackageVersion)
 
 # Extra preprocessor definitions
-add_definitions("-DUSES_NEW_IOSTREAMS -DLOFARLOGGER_SUBPACKAGE=\"PVSS\"")
+add_definitions(-DUSES_NEW_IOSTREAMS -DLOFARLOGGER_SUBPACKAGE="PVSS")
+
+# Add current source directory to -I path. This is needed because GCFPVSS uses
+# angle brackets for internal header files, instead of quotes.
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 lofar_add_library(gcfpvss
   Package__Version.cc

MAC/GCF/PVSS/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)
+
+# 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(tPVSSservice tPVSSservice.cc Response.cc)
+lofar_add_test(tPerformance tPerformance.cc PerformanceResponse.cc)
+lofar_add_test(tPVSSconnect tPVSSconnect.cc)
+lofar_add_test(tMonitorState tMonitorState.cc Response.cc)
+lofar_add_test(tPVSSinfo tPVSSinfo.cc Response.cc)
\ No newline at end of file

MAC/GCF/RTDB/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
+
+cmake_minimum_required(VERSION 2.6)
+
+## ---------------------------------------------------------------------------
+## Preamble: set compilers
+## ---------------------------------------------------------------------------
+include(LofarInit)
+
+## ---------------------------------------------------------------------------
+## Project characteristics
+## ---------------------------------------------------------------------------
+project(GCFRTDB)
+include(LofarGeneral)
+
+include(LofarAddPackage)
+lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common GCFPVSS GCFTM MACIO)
+
+## ---------------------------------------------------------------------------
+## External packages
+## ---------------------------------------------------------------------------
+include(LofarFindPackage)
+
+## ---------------------------------------------------------------------------
+## Generate configuration header file.
+## ---------------------------------------------------------------------------
+include(LofarConfig)
+
+## ---------------------------------------------------------------------------
+## Subdirectories
+## ---------------------------------------------------------------------------
+add_subdirectory(include/GCF/RTDB)
+add_subdirectory(src)
+add_subdirectory(test)

MAC/GCF/RTDB/include/GCF/RTDB/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
+
+# List of header files that will be installed.
+set(inst_HEADERS
+  Package__Version.h
+  DPservice.h
+  RTDB_PropertySet.h)
+
+# Add definition of include path suffix definition, because the header files
+# reside in a non-standard location. 
+set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX GCF/RTDB
+  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
+
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include/GCF/RTDB)
+
+# Install header files.
+install(FILES ${inst_HEADERS} DESTINATION include/GCF/RTDB)

MAC/GCF/RTDB/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)
+
+# Extra preprocessor definitions
+add_definitions(-DUSES_NEW_IOSTREAMS)
+
+# Add MAC protocols (generates a .ph and .cc file from a .prot file)
+include(MACAddProtocol)
+mac_add_protocol(DP_Protocol "${MACIO_SOURCE_DIR}/autogen")
+
+lofar_add_library(gcfrtdb
+  Package__Version.cc
+  DP_Protocol.cc
+  RTDB_PropertySet.cc
+  DPservice.cc
+  DPanswer.cc)
+
+lofar_add_bin_program(versiongcfrtdb versiongcfrtdb.cc)

MAC/GCF/RTDB/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)
+
+# Add the directory where the generated C++ headers are stored to the -I path.
+include_directories(${PROJECT_BINARY_DIR}/src)
+
+lofar_add_test(tPropertySet tPropertySet.cc)
+lofar_add_test(tRTDBPerformance tRTDBPerformance.cc RTDBPerfResp.cc)
+lofar_add_test(tDPservice tDPservice.cc DPresponse.cc)
+lofar_add_test(testQuery testQuery.cc)
+lofar_add_test(tPerformanceReport tPerformanceReport.cc RTDBPerfResp.cc)

MAC/GCF/TM/include/GCF/TM/CMakeLists.txt

@@ -36,6 +36,11 @@ set(inst_HEADERS
   GCF_TCPPort.h
   GCF_TimerPort.h)
 
+# Add definition of include path suffix definition, because the header files
+# reside in a non-standard location. 
+set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX GCF/TM
+  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")
+
 # Create symbolic link to include directory.
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -43,6 +48,3 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 
 # Install header files.
 install(FILES ${inst_HEADERS} DESTINATION include/GCF/TM)
-
-set(${PROJECT_NAME}_INCLUDE_PATH_SUFFIX GCF/TM
-  CACHE INTERNAL "Include path suffix for package \"${PROJECT_NAME}\"")

MAC/MACIO/include/MACIO/CMakeLists.txt

@@ -36,6 +36,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}\"")

MAC/MACIO/test/CMakeLists.txt

@@ -22,8 +22,8 @@ include(LofarCTest)
 
 include(MACAddProtocol)
 
-mac_add_protocol(Echo_Protocol "${${PROJECT_NAME}_SOURCE_DIR}/autogen")
-mac_add_protocol(testprotocol "${${PROJECT_NAME}_SOURCE_DIR}/autogen")
+mac_add_protocol(Echo_Protocol "${PROJECT_SOURCE_DIR}/autogen")
+mac_add_protocol(testprotocol "${PROJECT_SOURCE_DIR}/autogen")
 
 # Add current binary directory to -I path, so that the generated C++ header
 # files can be found.

lofar_config.h.cmake

-/* config.h.cmake.  [LOFAR.LCS.Common].  */
+/* DO NOT EDIT -- Generated by CMake from config.h.cmake -- DO NOT EDIT */
 
 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD 1
@@ -6,12 +6,6 @@
 /* Define as __PRETTY_FUNCTION__, __FUNCTION__, or "<unknown>" */
 #cmakedefine AUTO_FUNCTION_NAME @AUTO_FUNCTION_NAME@
 
-/* Define if DbgAssert is enabled */
-#cmakedefine ENABLE_DBGASSERT 1
-
-/* Define if TRACER is enabled */
-#cmakedefine ENABLE_TRACER 1
-
 /* Define if backtrace() is available */
 #cmakedefine HAVE_BACKTRACE 1
 
@@ -63,6 +57,9 @@
 /* Define if MPI profiler should be enabled */
 #cmakedefine HAVE_MPI_PROFILER 1
 
+/* Define if PVSS is installed */
+#cmakedefine HAVE_PVSS 1
+
 /* Define if using Rational Purify */
 #cmakedefine HAVE_PURIFY 1