From aa81875e4865060e91c9647d879d2ada73b140c6 Mon Sep 17 00:00:00 2001 From: Arno Schoenmakers <schoenmakers@astron.nl> Date: Tue, 5 Jul 2016 12:51:03 +0000 Subject: [PATCH] TAsk #6516: Adding variants file for new centos7 build host --- .gitattributes | 2 ++ CMake/variants/variants.buildhostcentos7 | 1 + CMake/variants/variants.lcs157 | 15 +++++++++++++++ 3 files changed, 18 insertions(+) create mode 120000 CMake/variants/variants.buildhostcentos7 create mode 100644 CMake/variants/variants.lcs157 diff --git a/.gitattributes b/.gitattributes index afffabe1f55..e5fe3c6e44a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2326,6 +2326,7 @@ CMake/testscripts/default.debug -text CMake/testscripts/timeout -text CMake/variants/variants.MacRenting -text CMake/variants/variants.b7015 -text +CMake/variants/variants.buildhostcentos7 -text CMake/variants/variants.cbt001 -text CMake/variants/variants.cbt002 -text CMake/variants/variants.cbt003 -text @@ -2341,6 +2342,7 @@ CMake/variants/variants.dragproc -text CMake/variants/variants.fs0 -text CMake/variants/variants.gpu01 -text CMake/variants/variants.gpu1 -text +CMake/variants/variants.lcs157 -text CMake/variants/variants.lexar -text CMake/variants/variants.lexar001 -text CMake/variants/variants.lexar002 -text diff --git a/CMake/variants/variants.buildhostcentos7 b/CMake/variants/variants.buildhostcentos7 new file mode 120000 index 00000000000..0c9019c0432 --- /dev/null +++ b/CMake/variants/variants.buildhostcentos7 @@ -0,0 +1 @@ +variants.lcs157 \ No newline at end of file diff --git a/CMake/variants/variants.lcs157 b/CMake/variants/variants.lcs157 new file mode 100644 index 00000000000..026dfdfff6f --- /dev/null +++ b/CMake/variants/variants.lcs157 @@ -0,0 +1,15 @@ +# Station software and the like apparently cannot (yet) handle shared libs. +option(BUILD_SHARED_LIBS "Build shared libraries" OFF) + +#set(ENV{JAVA_HOME} /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0) +#set(PVSS_ROOT_DIR /opt/pvss/pvss2_v3.7) +set(PVSS_ROOT_DIR /opt/WinCC_OA/3.14) +#set(LOG4CPLUS_ROOT_DIR "/usr/local/log4cplus") +set(CASACORE_ROOT_DIR "/opt/casacore") +set(QPID_ROOT_DIR /opt/qpid) + +#set(CTEST_CUSTOM_WARNING_EXCEPTION +# "/boost/date_time/time_facet.hpp:[0-9]+: warning: unused parameter" +# "/boost/date_time/time.hpp:[0-9]+: warning: unused parameter" +# "/pvss2_v3.7/api/include/(Basics|Datapoint|Manager|Messages)/" +#) -- GitLab