From 101cc3413a179570d48fde6ef257e619b01cff76 Mon Sep 17 00:00:00 2001 From: agrigora Date: Wed, 10 Dec 2014 11:39:43 +0100 Subject: [PATCH] Installing the content of data folder --- CMakeLists.txt | 9 +++++---- data/CMakeLists.txt | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1a4a7fd14e..a80d201eb21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,6 +263,10 @@ add_subdirectory(data) # Enable SHUTTLE compilation # Check if DIMDIR and ODIR are set if(SHUTTLE) + if(ROOT_HASALIEN STREQUAL "no") + message(FATAL_ERROR "Shuttle needs ROOT build with AliEn support. Please build ROOT with AliEn support. Do not forget to set ALIEN to your AliEn installation") + endif() + if(DIMDIR AND ODIR AND ALIEN) add_subdirectory(SHUTTLE) else() @@ -270,7 +274,4 @@ if(SHUTTLE) endif() endif(SHUTTLE) -add_subdirectory(ALIROOT) - -# Data -add_subdirectory(data) \ No newline at end of file +add_subdirectory(ALIROOT) \ No newline at end of file diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index e92a51ecd34..11280d552f9 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -15,6 +15,8 @@ # Installing data files -install(FILES maps/mfchebKGI_sym.root DESTINATION data/maps) +install(DIRECTORY . DESTINATION data + PATTERN "CMakeLists.txt" EXCLUDE + ) message(STATUS "DATA installed") -- 2.43.0