From 1a02a696ed240a45a03beea752ed5c99dc4fdef4 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Wed, 10 Jul 2019 11:57:14 +0200
Subject: [PATCH 1/2] cmake migration: fix a few glitches

* Clang requires LLVM on some platforms, so if LLVM is not there,
  this will fail.
* We need to protect against usage of simulation packages when
  Geant4 is not there.
---
 dependencies/O2Dependencies.cmake | 6 ++++--
 macro/CMakeLists.txt              | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dependencies/O2Dependencies.cmake b/dependencies/O2Dependencies.cmake
index 3d447e4ad4a58..7ee43d31941dd 100644
--- a/dependencies/O2Dependencies.cmake
+++ b/dependencies/O2Dependencies.cmake
@@ -130,11 +130,13 @@ set_package_properties(GLEW PROPERTIES TYPE OPTIONAL)
 find_package(OpenGL)
 set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL)
 
+find_package(LLVM)
+set_package_properties(LLVM PROPERTIES TYPE OPTIONAL)
+if(LLVM_FOUND)
 find_package(Clang)
 set_package_properties(Clang PROPERTIES TYPE OPTIONAL)
+endif()
 
-find_package(LLVM)
-set_package_properties(LLVM PROPERTIES TYPE OPTIONAL)
 
 find_package(O2GPU)
 
diff --git a/macro/CMakeLists.txt b/macro/CMakeLists.txt
index a4d4a3650a6e4..51d770f88cfed 100644
--- a/macro/CMakeLists.txt
+++ b/macro/CMakeLists.txt
@@ -123,6 +123,7 @@ o2_add_test_root_macro(
   initSimGeomAndField.C
   PUBLIC_LINK_LIBRARIES O2::DataFormatsParameters O2::Field)
 
+if(Geant4_FOUND)
 o2_add_test_root_macro(o2sim.C
                        PUBLIC_LINK_LIBRARIES O2::Generators
                                              O2::DetectorsPassive
@@ -145,6 +146,7 @@ o2_add_test_root_macro(o2sim.C
                                              O2::CommonTypes
                                              O2::SimSetup
                                              O2::Steer)
+endif()
 
 # FIXME: move to subsystem dir + add includes if one wants to compile it...
 # o2_add_test_root_macro( putCondition.C)

From 825eb00167844b4658bde2cccf2bf6e6a6c2dcff Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Wed, 10 Jul 2019 13:07:54 +0200
Subject: [PATCH 2/2] Update ROOT

---
 dependencies/O2Dependencies.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/O2Dependencies.cmake b/dependencies/O2Dependencies.cmake
index 7ee43d31941dd..7591519f8799e 100644
--- a/dependencies/O2Dependencies.cmake
+++ b/dependencies/O2Dependencies.cmake
@@ -41,7 +41,7 @@ set_package_properties(arrow PROPERTIES TYPE REQUIRED)
 find_package(Vc)
 set_package_properties(Vc PROPERTIES TYPE REQUIRED)
 
-find_package(ROOT 6.06.00 MODULE)
+find_package(ROOT 6.16.00 MODULE)
 set_package_properties(ROOT PROPERTIES TYPE REQUIRED)
 
 find_package(fmt)