From f456b180b68a2bcf10f47f78bedc6b3637a1f894 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 3 Jul 2009 13:42:27 +0000
Subject: [PATCH] Bug 1310: Fixed several small issues with new CMake files for
MAC/APL
---
MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt | 2 +-
MAC/APL/PIC/CMakeLists.txt | 9 +--------
MAC/APL/PIC/RSP_Protocol/CMakeLists.txt | 2 +-
MAC/APL/RTCCommon/src/CMakeLists.txt | 4 ----
lofar_config.h.cmake | 6 ++++++
5 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt b/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
index c6fee622776..937948b95f0 100644
--- a/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
+++ b/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)
diff --git a/MAC/APL/PIC/CMakeLists.txt b/MAC/APL/PIC/CMakeLists.txt
index 048cac53a04..2419d3c8de1 100644
--- a/MAC/APL/PIC/CMakeLists.txt
+++ b/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
## ---------------------------------------------------------------------------
diff --git a/MAC/APL/PIC/RSP_Protocol/CMakeLists.txt b/MAC/APL/PIC/RSP_Protocol/CMakeLists.txt
index 0b9d27ae1ea..6f047a8e739 100644
--- a/MAC/APL/PIC/RSP_Protocol/CMakeLists.txt
+++ b/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}
diff --git a/MAC/APL/RTCCommon/src/CMakeLists.txt b/MAC/APL/RTCCommon/src/CMakeLists.txt
index f575172ec05..24bb70ff3f2 100644
--- a/MAC/APL/RTCCommon/src/CMakeLists.txt
+++ b/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)
diff --git a/lofar_config.h.cmake b/lofar_config.h.cmake
index 3f1ab4cf1d0..4789ef42799 100644
--- a/lofar_config.h.cmake
+++ b/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
--
GitLab