diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cc96dd95acb2f7854640368ba2947dab3bef781..07b49b702e9b0427fc52c6d5946732c2cef68ee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,6 +114,12 @@ IF(DD4HEP_USE_LCIO)
   DD4HEP_SETUP_LCIO_TARGETS()
 ENDIF()
 
+
+IF(DD4HEP_USE_GEANT4)
+  find_package(Geant4 10.2.2 REQUIRED COMPONENTS gdml ui_all vis_all)
+  DD4HEP_SETUP_GEANT4_TARGETS()
+endif()
+
 ######################
 # Set compiler flags #
 ######################
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index caff264787ecf8444d1946c7f6b7c1d246d7223f..0fd65cecbec4d08a7cc5e7b30ee2db9214d83e78 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -14,9 +14,6 @@ IF(NOT DD4HEP_USE_GEANT4)
   RETURN()
 ENDIF()
 
-find_package(Geant4 10.2.2 REQUIRED COMPONENTS gdml ui_all vis_all)
-DD4HEP_SETUP_GEANT4_TARGETS()
-
 # dd4hep_package(    DDG4
 #   USES            [GEANT4 REQUIRED COMPONENTS gdml ui_all vis_all]
 #                   [ROOT   REQUIRED COMPONENTS Geom GenVector RIO]