diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
index 61b94702b1e106ba914b8225dd17a14e522daaa2..826994125bd2d22d391e2d956c50ac1ffa5e5e82 100644
--- a/Simulation/CMakeLists.txt
+++ b/Simulation/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-#add_subdirectory(DetSimAna)
+add_subdirectory(DetSimAna)
 add_subdirectory(DetSimCore)
 #add_subdirectory(DetSimDedx)
 #add_subdirectory(DetSimFastModel)
diff --git a/Simulation/DetSimAna/CMakeLists.txt b/Simulation/DetSimAna/CMakeLists.txt
index e0c9aca523f0e6f33ffc9b33c40a2d7aca33c971..242dbc5a49a41c8904a98317485774e7ea559cfa 100644
--- a/Simulation/DetSimAna/CMakeLists.txt
+++ b/Simulation/DetSimAna/CMakeLists.txt
@@ -1,44 +1,25 @@
 
-gaudi_subdir(DetSimAna v0r0)
-
-gaudi_depends_on_subdirs(
-    FWCore
-    Simulation/DetSimInterface
-)
-
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
 find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 
 # For EDM & I/O
-find_package(podio REQUIRED)
 find_package(EDM4HEP REQUIRED)
-# find_package(LCIO REQUIRED)
 
 set(DetSimAna_srcs
-#    src/ExampleAnaElemTool.cpp
     src/Edm4hepWriterAnaElemTool.cpp
 )
-message("podio_LIBRARIES: ${podio_LIBRARIES}")
-gaudi_add_module(DetSimAna ${DetSimAna_srcs}
-    INCLUDE_DIRS
-      # DetSimInterface
-      # FWCore
-      # DD4hep
-      # GaudiKernel
-      # Geant4 
-      # ${plcio_INCLUDE_DIRS}
-      # ${podio_INCLUDE_DIRS}
-    LINK_LIBRARIES
-      # DetSimInterface
-      # FWCore
-      DD4hep
-      ${DD4hep_COMPONENT_LIBRARIES} 
-      GaudiKernel
-      # Geant4
 
-      -Wl,--no-as-needed 
-      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
-      -Wl,--as-needed 
-      # ${podio_LIBRARIES}
+gaudi_add_module(DetSimAna
+                 SOURCES ${DetSimAna_srcs}
+                 LINK DetSimInterface
+                      ${DD4hep_COMPONENT_LIBRARIES} 
+                      Gaudi::GaudiKernel
+                      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
+
+install(TARGETS DetSimAna
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)