From 28eb080bc05894cbd0c75b6d886a9856ab29287b Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Wed, 18 Jan 2012 12:18:15 +0000
Subject: [PATCH] Task #3000: Applied the proposed patch.
---
RTCP/Storage/src/Storage_main.cc | 3 ++-
RTCP/Storage/src/plotMS.cc | 3 ++-
lofar_config.h.cmake | 7 -------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/RTCP/Storage/src/Storage_main.cc b/RTCP/Storage/src/Storage_main.cc
index a081b85b5be..3ca67588580 100644
--- a/RTCP/Storage/src/Storage_main.cc
+++ b/RTCP/Storage/src/Storage_main.cc
@@ -27,6 +27,7 @@
#include <sys/select.h>
#include <unistd.h>
#include <cstdio>
+#include <cstdlib>
#include <stdexcept>
#include <string>
@@ -107,7 +108,7 @@ void ExitOnClosedStdin::mainLoop()
int main(int argc, char *argv[])
{
#if defined HAVE_LOG4CPLUS
- INIT_LOGGER( CMAKE_INSTALL_PREFIX "/etc/Storage_main.log_prop" );
+ INIT_LOGGER(string(getenv("LOFARROOT") ? : ".") + "/etc/Storage_main.log_prop");
#elif defined HAVE_LOG4CXX
#error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
Context::initialize();
diff --git a/RTCP/Storage/src/plotMS.cc b/RTCP/Storage/src/plotMS.cc
index 945b45fd1d8..48d2ec5ac7f 100644
--- a/RTCP/Storage/src/plotMS.cc
+++ b/RTCP/Storage/src/plotMS.cc
@@ -18,6 +18,7 @@
#include <Common/DataConvert.h>
#include <string>
#include <cstdio>
+#include <cstdlib>
#include <unistd.h>
#include <casa/IO/AipsIO.h>
@@ -53,7 +54,7 @@ static void usage(char *progname, int exitcode)
int main(int argc, char *argv[])
{
#if defined HAVE_LOG4CPLUS
- INIT_LOGGER( CMAKE_INSTALL_PREFIX "/etc/Storage.log_prop" );
+ INIT_LOGGER(string(getenv("LOFARROOT") ? : ".") + "/etc/Storage.log_prop");
#elif defined HAVE_LOG4CXX
#error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
Context::initialize();
diff --git a/lofar_config.h.cmake b/lofar_config.h.cmake
index 49c513484d8..54cb374ec7e 100644
--- a/lofar_config.h.cmake
+++ b/lofar_config.h.cmake
@@ -1,12 +1,5 @@
/* $Id$ */
-/*-------------------------------------------------------------------------*\
-| Defines installation information |
-\*-------------------------------------------------------------------------*/
-
-/* Define the destination root directory into which the software will be installed */
-#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
-
/*-------------------------------------------------------------------------*\
| Defines for the presence or absence of (system) header files |
\*-------------------------------------------------------------------------*/
--
GitLab