Bug 1310: Fixed several small issues with new CMake files for MAC/APL

MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt

@@ -28,5 +28,5 @@ configure_file(
   ${CMAKE_CURRENT_BINARY_DIR}/MACScheduler.conf)
 
 install(FILES
-  MACScheduler.conf
+  ${CMAKE_CURRENT_BINARY_DIR}/MACScheduler.conf
   DESTINATION etc)

MAC/APL/PIC/CMakeLists.txt

@@ -28,16 +28,9 @@ include(LofarInit)
 ## ---------------------------------------------------------------------------
 ## Project characteristics
 ## ---------------------------------------------------------------------------
-project(APL)
+project(PIC)
 include(LofarGeneral)
 
-## ---------------------------------------------------------------------------
-## Create directory APL in the binary include directory; it will hold symbolic
-## links to the different subcomponents of APL.
-## ---------------------------------------------------------------------------
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
-  ${CMAKE_BINARY_DIR}/include/APL)
-
 ## ---------------------------------------------------------------------------
 ## Subdirectories
 ## ---------------------------------------------------------------------------

MAC/APL/PIC/RSP_Protocol/CMakeLists.txt

@@ -41,7 +41,7 @@ include(LofarFindPackage)
 lofar_find_package(Blitz REQUIRED)
 
 ## ---------------------------------------------------------------------------
-## Create extra symbolic link, thanks to inconsistent naming conventions!
+## Need extra symbolic link, thanks to inconsistent naming conventions!
 ## ---------------------------------------------------------------------------
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
   ${CMAKE_BINARY_DIR}/include/MAC/APL/PIC/${PROJECT_NAME}

MAC/APL/RTCCommon/src/CMakeLists.txt

@@ -41,10 +41,6 @@ lofar_add_library(gnuplot_i gnuplot_i.cc)
 
 lofar_add_bin_program(versionrtccommon versionrtccommon.cc)
 
-install(PROGRAMS
-  swlevel
-  DESTINATION bin)
-
 install(FILES
   rc.status
   DESTINATION etc)

lofar_config.h.cmake

@@ -28,6 +28,9 @@
 /* Define to 1 if you have the <strings.h> header file. */
 #cmakedefine HAVE_STRINGS_H 1
 
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#cmakedefine HAVE_SYS_MMAN_H 1
+
 /* Define to 1 if you have the <sys/resource.h> header file. */
 #cmakedefine HAVE_SYS_RESOURCE_H 1
 
@@ -37,6 +40,9 @@
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H 1
 
+/* Define to 1 if you have the <sys/timepps.h> header file. */
+#cmakedefine HAVE_SYS_TIMEPPS_H 1
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H 1