diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index 033e238a8f3f68e597ef19103d33166e4e0838aa..be45fff6cab99071fd9915a4452980e4a22b9340 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-# add_subdirectory(DetCEPCv4)
+add_subdirectory(DetCEPCv4)
 add_subdirectory(DetCRD)
 add_subdirectory(DetDriftChamber)
 add_subdirectory(DetEcalMatrix)
diff --git a/Detector/DetCEPCv4/CMakeLists.txt b/Detector/DetCEPCv4/CMakeLists.txt
index 69bcc73e14484665c6ec628ae20e3fce63c765f3..bc2e5d702b0f566866bda4e77e57731909b9ce9d 100644
--- a/Detector/DetCEPCv4/CMakeLists.txt
+++ b/Detector/DetCEPCv4/CMakeLists.txt
@@ -3,10 +3,6 @@
 # Ref to Package: DetFCCeeIDEA
 # Based on package: lcgeo
 ################################################################################
-gaudi_subdir(DetCEPCv4 v0r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
-
 
 find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
 # find_package(DD4hep)
@@ -18,7 +14,7 @@ include( DD4hep )
 
 find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
 
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCEPCv4)
+# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCEPCv4)
 
 set(DetCEPCv4_src
     src/tracker/VXD04_geo.cpp
@@ -40,20 +36,14 @@ 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
+                 SOURCES ${DetCEPCv4_src}
+		 LINK ${DD4hep_COMPONENT_LIBRARIES}
 )
 
+target_include_directories(DetCEPCv4 PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/src/include
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")
 dd4hep_generate_rootmap(DetCEPCv4)