From 7583f6ba48a0cd3feb520bd3f491194c2e6dceda Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Tue, 13 Nov 2018 18:37:23 +0100
Subject: [PATCH] Added the manually specified cmake variable named NoAcs.
Please note that this variable currently has no effect when building the CTA
rpms
---
CMakeLists.txt | 8 ++++++++
mediachanger/CMakeLists.txt | 5 ++++-
tests/CMakeLists.txt | 8 ++++++--
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b17823566..0c63df723e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,14 @@ endif (NOT DEFINED SKIP_UNIT_TESTS)
#Load version information in all cases.
include(cmake/CTAVersions.cmake)
+if (DEFINED NoACS)
+ message (STATUS "Running CMake without support for ACS")
+ set (use_manually_specified_variable ${NoACS})
+else (DEFINED NoACS)
+ message (STATUS "Running CMake with support for ACS")
+ message (STATUS "Override with -DNoACS:Bool=true")
+endif (DEFINED NoACS)
+
IF(DEFINED PackageOnly)
message (STATUS "Running CMake in package-only mode")
set(COMPILE_PACKAGING "1")
diff --git a/mediachanger/CMakeLists.txt b/mediachanger/CMakeLists.txt
index f5f23d6791..4f464de54e 100644
--- a/mediachanger/CMakeLists.txt
+++ b/mediachanger/CMakeLists.txt
@@ -15,7 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
cmake_minimum_required (VERSION 2.6)
-add_subdirectory(acs)
+if (NOT DEFINED NoACS)
+ add_subdirectory(acs)
+endif (NOT DEFINED NoACS)
+
add_subdirectory(reactor)
add_subdirectory(castorrmc)
find_package(openssl REQUIRED)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a93a5ec30f..10703a663c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -40,11 +40,15 @@ target_link_libraries(cta-unitTests
ctaschedulerunittests
ctadaemonunittests
ctamediachangerunittests
- ctamediachangeracsdaemonunittests
- ctamediachangeracsunittests
gtest
pthread)
+if (NOT DEFINED NoACS)
+ target_link_libraries(cta-unitTests
+ ctamediachangeracsdaemonunittests
+ ctamediachangeracsunittests)
+endif (NOT DEFINED NoACS)
+
set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
if (OCCI_SUPPORT)
set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
--
GitLab