Fixed some bugs with cmakelists. Added more tests.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4734391e96e92b97e0c8b7674ee9e226e8a550f7..ccb80ddb9b533e383324f5792eb4e2947f05c20a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ Check_out_of_Source_Build()
 Set(ALIROOT_INSTALL_DIR ${ALICE_INSTALL}/${ALICE_TARGET})
 
 # Setup GEANT3
-find_package(GEANT3 REQUIRED)
+find_package(GEANT3)
 
 # Setup RuleChecker
 find_package(RuleChecker)
@@ -118,21 +118,24 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/STEER/ARVersion.h.in ${CMAKE_CURRENT_
 execute_process(COMMAND root-config --features OUTPUT_VARIABLE FEATURES)
 string(REGEX MATCH "pythia6" PYTHIA6 ${FEATURES})
 string(REGEX MATCH "pythia8" PYTHIA8 ${FEATURES})
+string(REGEX MATCH "opengl" OPENGL ${FEATURES})
 if(PYTHIA6)
   message(STATUS "Pythia6 enabled")
 endif(PYTHIA6)
 if(PYTHIA8)
   message(STATUS "Pythia8 enabled")
 endif(PYTHIA8)
-
+if(OPENGL)
+  message(STATUS "OpenGL enabled")     
+endif(OPENGL)  
+option (TFLUKA "Build TFluka" OFF)
+option (THYDJET "Build THydjet" OFF)
+option (SHUTTLE "Build SHUTTLE" OFF)
+
+       
 # Recurse into the given subdirectories.  This does not actually
 # cause another cmake executable to run.  The same process will walk through
 # the project's entire directory structure.
-
-
-#Add_subdirectory(TFluka) 
-#Add_subdirectory(THydjet) 
-
 Add_subdirectory(ACORDE) 
 Add_subdirectory(ANALYSIS) 
 Add_subdirectory(BCM) 
@@ -141,7 +144,9 @@ Add_subdirectory(DPMJET)
 Add_subdirectory(EMCAL) 
 Add_subdirectory(EPOS) 
 Add_subdirectory(ESDCheck) 
+if(OPENGL)
 Add_subdirectory(EVE) 
+endif(OPENGL)
 Add_subdirectory(EVGEN) 
 Add_subdirectory(FASTSIM) 
 Add_subdirectory(FMD)
@@ -172,6 +177,10 @@ if(PYTHIA8)
 Add_subdirectory(PYTHIA8) 
 endif(PYTHIA8)
 Add_subdirectory(RAW) 
+if(SHUTTLE)
+message("SHUTTLE")
+Add_subdirectory(SHUTTLE)
+endif(SHUTTLE) 
 Add_subdirectory(STAT) 
 Add_subdirectory(STEER)
 Add_subdirectory(STRUCT) 
@@ -181,7 +190,12 @@ Add_subdirectory(TEPEMGEN)
 Add_subdirectory(THbtp) 
 Add_subdirectory(THerwig) 
 Add_subdirectory(THijing)
-#Add_subdirectory(TIsajet) 
+if(TFLUKA)
+Add_subdirectory(TFluka)
+endif(TFLUKA)
+if(THYDJET)    
+Add_subdirectory(THydjet)
+endif(THYDJET)
 Add_subdirectory(TOF) 
 Add_subdirectory(TPC)
 Add_subdirectory(TRD) 
@@ -196,4 +210,4 @@ add_test ("Aliroot_executable" aliroot -q)
 #copy testing files
 execute_process(COMMAND "cmake" "-E" "copy_directory" "${ALICE_ROOT}/test" "${ALICE_INSTALL}/test")
 
-message("Note : In order for the warnings test to execute successfully you need to log your make build output to make.log in the ALICE_INSTALL Directory using this command \n make -k > make.log 2>&1")
\ No newline at end of file
+message("Note : In order for the warnings test to execute successfully you need to log your make build output to make.log in the ALICE_INSTALL Directory using this command \n make -k > make.log 2>&1")

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fac9f9d152bc8e8d8d2d60d65c5392f1a32e202e..46bc05343065bff98a4f9d69284f37e983f1cd8c 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,4 +14,10 @@ If(RULE_CHECKER_FOUND)
 add_test("Violations" cmake -P Violation.cmake)
 EndIf(RULE_CHECKER_FOUND)
 add_subdirectory(gun)
-add_subdirectory(ppbench)
\ No newline at end of file
+add_subdirectory(ppbench)
+add_subdirectory(genkine)
+add_subdirectory(merge)
+add_subdirectory(pploadlibs)
+add_subdirectory(PbPbbench)
+add_subdirectory(pileup)
+

diff --git a/test/PbPbbench/CMakeLists.txt b/test/PbPbbench/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8277168
--- /dev/null
+++ b/test/PbPbbench/CMakeLists.txt
@@ -0,0 +1 @@
+add_test("PbPbbench_test" runtest.sh)

diff --git a/test/genkine/CMakeLists.txt b/test/genkine/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b4e0f5a
--- /dev/null
+++ b/test/genkine/CMakeLists.txt
@@ -0,0 +1 @@
+add_test("Genkine_test" runtest.sh)

diff --git a/test/merge/CMakeLists.txt b/test/merge/CMakeLists.txt
new file mode 100644 (file)
index 0000000..dfef741
--- /dev/null
+++ b/test/merge/CMakeLists.txt
@@ -0,0 +1 @@
+add_test("Merge_test" runtest.sh)

diff --git a/test/pileup/CMakeLists.txt b/test/pileup/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c600447
--- /dev/null
+++ b/test/pileup/CMakeLists.txt
@@ -0,0 +1 @@
+add_test("Pileup_test" runtest.sh)

diff --git a/test/pploadlibs/CMakeLists.txt b/test/pploadlibs/CMakeLists.txt
new file mode 100644 (file)
index 0000000..795b1a8
--- /dev/null
+++ b/test/pploadlibs/CMakeLists.txt
@@ -0,0 +1 @@
+add_test("PPloadlibs_test" runtest.sh)