From 89f0ac0f510b5dd8715537e04782f70bf478ad2f Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:48:48 +0200
Subject: [PATCH] Reorder linked libraries (#67)

Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
---
 Detector/DetComponents/CMakeLists.txt |  9 +++++----
 Detector/DetStudies/CMakeLists.txt    |  9 ++++-----
 SimG4Components/CMakeLists.txt        | 14 ++++++++------
 SimG4Fast/CMakeLists.txt              |  4 ++--
 SimG4Full/CMakeLists.txt              |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Detector/DetComponents/CMakeLists.txt b/Detector/DetComponents/CMakeLists.txt
index e385a43..c0afa45 100644
--- a/Detector/DetComponents/CMakeLists.txt
+++ b/Detector/DetComponents/CMakeLists.txt
@@ -6,16 +6,17 @@
 file(GLOB _sources src/*.cpp)
 gaudi_add_module(DetComponents
                  SOURCES ${_sources}
-                 LINK k4FWCore::k4FWCore
+                 LINK
+                      DD4hep::DDCore
+                      DD4hep::DDG4
+                      DD4hep::DDRec
+                      k4FWCore::k4FWCore
                       k4FWCore::k4Interface
                       Gaudi::GaudiAlgLib
                       Gaudi::GaudiKernel
                       EDM4HEP::edm4hep
                       ROOT::Core
                       ROOT::Hist
-                      DD4hep::DDCore
-                      DD4hep::DDG4
-                      DD4hep::DDRec
 )
 
 install(TARGETS DetComponents
diff --git a/Detector/DetStudies/CMakeLists.txt b/Detector/DetStudies/CMakeLists.txt
index 41e8e79..544ff7c 100644
--- a/Detector/DetStudies/CMakeLists.txt
+++ b/Detector/DetStudies/CMakeLists.txt
@@ -5,21 +5,20 @@
 
 find_package(ROOT COMPONENTS MathCore GenVector Geom Tree)
 
-find_package(CLHEP)
-
-
 #--- Add main module
 file(GLOB _sources src/components/*.cpp)
 gaudi_add_module(DetStudies
                  SOURCES ${_sources}
-                 LINK k4FWCore::k4FWCore
+                 LINK
+                      DD4hep::DDCore
+                      DD4hep::DDG4
+                      k4FWCore::k4FWCore
                       k4FWCore::k4Interface
                       Gaudi::GaudiAlgLib
                       Gaudi::GaudiKernel
                       EDM4HEP::edm4hep
                       ROOT::Core
                       ROOT::Hist
-                      DD4hep::DDCore
                 )
 
 install(TARGETS DetStudies
diff --git a/SimG4Components/CMakeLists.txt b/SimG4Components/CMakeLists.txt
index 80443fd..fc8e0ec 100644
--- a/SimG4Components/CMakeLists.txt
+++ b/SimG4Components/CMakeLists.txt
@@ -6,15 +6,17 @@
 file(GLOB _lib_sources src/*.cpp)
 gaudi_add_module(SimG4Components
                  SOURCES ${_lib_sources}
-                 LINK Gaudi::GaudiAlgLib
-                      k4FWCore::k4FWCore
-                      k4FWCore::k4Interface
-                      SimG4Common
-                      EDM4HEP::edm4hep
+                 LINK
+                      CLHEP::CLHEP
                       DD4hep::DDCore
                       DD4hep::DDG4
-                      CLHEP::CLHEP
+                      ${Geant4_LIBRARIES}
+                      SimG4Common
                       SimG4Interface
+                      k4FWCore::k4FWCore
+                      k4FWCore::k4Interface
+                      EDM4HEP::edm4hep
+                      Gaudi::GaudiAlgLib
 )
 
 add_test(NAME CrossingAngleBoost
diff --git a/SimG4Fast/CMakeLists.txt b/SimG4Fast/CMakeLists.txt
index 6c878c8..c710fa1 100644
--- a/SimG4Fast/CMakeLists.txt
+++ b/SimG4Fast/CMakeLists.txt
@@ -6,11 +6,11 @@
 file(GLOB _lib_sources src/lib/*.cpp)
 gaudi_add_library(SimG4Fast
                  SOURCES ${_lib_sources}
-                 LINK Gaudi::GaudiAlgLib k4FWCore::k4FWCore SimG4Common EDM4HEP::edm4hep DD4hep::DDCore SimG4Interface)
+                 LINK DD4hep::DDCore SimG4Common SimG4Interface Gaudi::GaudiAlgLib k4FWCore::k4FWCore EDM4HEP::edm4hep)
 
 
 file(GLOB _module_sources src/components/*.cpp)
 gaudi_add_module(SimG4FastPlugins
                  SOURCES ${_module_sources}
-                 LINK Gaudi::GaudiAlgLib k4FWCore::k4FWCore SimG4Common EDM4HEP::edm4hep DD4hep::DDCore SimG4Interface SimG4Fast)
+                 LINK DD4hep::DDCore SimG4Common SimG4Interface SimG4Fast Gaudi::GaudiAlgLib k4FWCore::k4FWCore EDM4HEP::edm4hep)
 
diff --git a/SimG4Full/CMakeLists.txt b/SimG4Full/CMakeLists.txt
index b81fb80..6e04ce3 100644
--- a/SimG4Full/CMakeLists.txt
+++ b/SimG4Full/CMakeLists.txt
@@ -5,7 +5,7 @@
 file(GLOB _lib_sources src/lib/*.cpp)
 gaudi_add_library(SimG4Full
                  SOURCES ${_lib_sources}
-                 LINK Gaudi::GaudiAlgLib k4FWCore::k4FWCore SimG4Common EDM4HEP::edm4hep ${Geant4_LIBRARIES} SimG4Interface)
+                 LINK SimG4Common SimG4Interface Gaudi::GaudiAlgLib k4FWCore::k4FWCore EDM4HEP::edm4hep)
 
 #target_include_directories(SimG4Full PUBLIC ${Geant4_INCLUDE_DIRS}
 #  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
@@ -14,4 +14,4 @@ gaudi_add_library(SimG4Full
 file(GLOB _module_sources src/components/*.cpp)
 gaudi_add_module(SimG4FullPlugins
                  SOURCES ${_module_sources}
-                 LINK Gaudi::GaudiAlgLib k4FWCore::k4FWCore SimG4Common EDM4HEP::edm4hep DD4hep::DDCore SimG4Interface SimG4Full)
+                 LINK SimG4Full SimG4Common SimG4Interface Gaudi::GaudiAlgLib k4FWCore::k4FWCore EDM4HEP::edm4hep)