Fix build with GAUDI_USE_AIDA=OFF

See merge request !1474

GaudiExamples/CMakeLists.txt

@@ -132,19 +132,19 @@ if(GAUDI_USE_AIDA)
                                          src/IO/WriteHandleAlg.cpp
                                          src/RandomNumber/RandomNumberAlg.cpp)
     target_link_libraries(GaudiExamples PRIVATE AIDA::aida)
+    if(GAUDI_USE_CLHEP)
+        target_sources(GaudiExamples PRIVATE src/TupleEx/TupleAlg2.cpp
+                                             src/TupleEx/TupleAlg3.cpp
+                                             src/TupleEx/TupleAlg.cpp
+                                             src/TupleEx/TupleDef.cpp)
+        target_link_libraries(GaudiExamples PRIVATE CLHEP::CLHEP)
+    endif()
 endif()
 if(GAUDI_USE_HEPPDT)
     target_sources(GaudiExamples PRIVATE src/PartProp/GaudiPPS.cpp
                                          src/PartProp/PartPropExa.cpp)
     target_link_libraries(GaudiExamples PRIVATE HepPDT::heppdt)
 endif()
-if(GAUDI_USE_CLHEP)
-    target_sources(GaudiExamples PRIVATE src/TupleEx/TupleAlg2.cpp
-                                         src/TupleEx/TupleAlg3.cpp
-                                         src/TupleEx/TupleAlg.cpp
-                                         src/TupleEx/TupleDef.cpp)
-    target_link_libraries(GaudiExamples PRIVATE CLHEP::CLHEP)
-endif()
 if(TARGET RootCnvLib)
     target_sources(GaudiExamples PRIVATE src/MultiInput/DumpAddress.cpp
                                          src/MultiInput/MIReadAlg.cpp

GaudiPython/CMakeLists.txt

@@ -22,10 +22,10 @@ gaudi_add_library(GaudiPythonLib
 if(GAUDI_USE_AIDA)
    target_sources(GaudiPythonLib PRIVATE src/Lib/HistoDecorator.cpp)
    target_link_libraries(GaudiPythonLib PUBLIC AIDA::aida)
-endif()
-if(GAUDI_USE_CLHEP)
-   target_sources(GaudiPythonLib PRIVATE src/Lib/TupleDecorator.cpp)
-   target_link_libraries(GaudiPythonLib PUBLIC CLHEP::CLHEP)
+   if(GAUDI_USE_CLHEP)
+      target_sources(GaudiPythonLib PRIVATE src/Lib/TupleDecorator.cpp)
+      target_link_libraries(GaudiPythonLib PUBLIC CLHEP::CLHEP)
+   endif()
 endif()
 
 # Build the plugin

GaudiPython/dict/kernel.h

@@ -75,13 +75,13 @@
 #include "GaudiPython/GaudiPython.h"
 #ifdef AIDA_FOUND
 #  include "GaudiPython/HistoDecorator.h"
-#endif // AIDA_FOUND
+#  ifdef CLHEP_FOUND
+#    include "GaudiPython/TupleDecorator.h"
+#  endif // CLHEP_FOUND
+#endif   // AIDA_FOUND
 #include "GaudiPython/Interface.h"
 #include "GaudiPython/Printer.h"
 #include "GaudiPython/Vector.h"
-#ifdef CLHEP_FOUND
-#  include "GaudiPython/TupleDecorator.h"
-#endif // CLHEP_FOUND
 
 #ifdef AIDA_FOUND
 #  include "GaudiAlg/GaudiHistoAlg.h"