diff --git a/Detector/DetCEPCv4/CMakeLists.txt b/Detector/DetCEPCv4/CMakeLists.txt
index 8d245fbd7245610a0bbb8648822399085c06105c..7211736c7da3355f0fc13268db49de7f408e0dcb 100644
--- a/Detector/DetCEPCv4/CMakeLists.txt
+++ b/Detector/DetCEPCv4/CMakeLists.txt
@@ -9,6 +9,7 @@ gaudi_depends_on_subdirs(GaudiKernel)
 
 
 find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
+# find_package(DD4hep)
 find_package(Geant4)
 include(${Geant4_USE_FILE})
 
@@ -31,8 +32,18 @@ set(DetCEPCv4_src
 
 gaudi_add_module(DetCEPCv4
                   ${DetCEPCv4_src}
-		  INCLUDE_DIRS DD4hep ROOT Geant4 src/include
-		  LINK_LIBRARIES GaudiKernel DD4hep ${DD4hep_COMPONENT_LIBRARIES} ROOT Geant4)
+		  INCLUDE_DIRS 
+                  # DD4hep 
+                  # ROOT 
+                  # Geant4 
+                  src/include
+		  LINK_LIBRARIES
+                  # GaudiKernel
+                  DD4hep
+                  ${DD4hep_COMPONENT_LIBRARIES}
+                  # ROOT 
+                  # Geant4
+)
 
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")
diff --git a/Detector/DetEcalMatrix/CMakeLists.txt b/Detector/DetEcalMatrix/CMakeLists.txt
index 569a9e8fdb5ae716b4d7982c4f6a5a4fb5a8944f..54407d226fed4c44d41a0294e3ac8a8f0ebef1db 100644
--- a/Detector/DetEcalMatrix/CMakeLists.txt
+++ b/Detector/DetEcalMatrix/CMakeLists.txt
@@ -24,8 +24,13 @@ set(DetEcalMatrix_src
 
 gaudi_add_module(DetEcalMatrix
                   ${DetEcalMatrix_src}
-		  INCLUDE_DIRS DD4hep ROOT Geant4 src/include
-		  LINK_LIBRARIES GaudiKernel DD4hep ${DD4hep_COMPONENT_LIBRARIES} ROOT Geant4)
+		  INCLUDE_DIRS
+                  # DD4hep ROOT Geant4 src/include
+		  LINK_LIBRARIES 
+                  # GaudiKernel 
+                  DD4hep ${DD4hep_COMPONENT_LIBRARIES} 
+                  # ROOT Geant4
+)
 
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")
diff --git a/Detector/GeoSvc/CMakeLists.txt b/Detector/GeoSvc/CMakeLists.txt
index 569c85334afb3ab6027dd66d158c6e6bd4b1afd6..2a5b97ded1389cd0a45a5f41ba8d5c562580a031 100644
--- a/Detector/GeoSvc/CMakeLists.txt
+++ b/Detector/GeoSvc/CMakeLists.txt
@@ -18,7 +18,13 @@ find_package(DD4hep COMPONENTS DDG4 DDRec REQUIRED)
 gaudi_add_module(GeoSvc
                  src/GeoSvc.cpp
                  INCLUDE_DIRS
-                   DetInterface DD4hep GaudiKernel ROOT 
+                   # DetInterface
+                   # DD4hep
+                   # GaudiKernel
+                   # ROOT 
                  LINK_LIBRARIES
-                   DD4hep ${DD4hep_COMPONENT_LIBRARIES} GaudiKernel ROOT
+                   DD4hep 
+                   ${DD4hep_COMPONENT_LIBRARIES} 
+                   GaudiKernel 
+                   # ROOT
 )
\ No newline at end of file