diff --git a/Analysis/CMakeLists.txt b/Analysis/CMakeLists.txt
index 46a842b2ef11bfd99dcb9a87eb7e54722d31329f..7e666e5bb77e848d9218a4ee66b5018fcd871a94 100644
--- a/Analysis/CMakeLists.txt
+++ b/Analysis/CMakeLists.txt
@@ -1,2 +1,3 @@
 
 add_subdirectory(TotalInvMass)
+add_subdirectory(TrackInspect)
diff --git a/Analysis/TrackInspect/CMakeLists.txt b/Analysis/TrackInspect/CMakeLists.txt
index 44a4d4b7d24e54556816793cbb7e0d09f5a2cfe3..fa42c0508250c1fb1f7e7f2afcb68c8452cbe3ce 100644
--- a/Analysis/TrackInspect/CMakeLists.txt
+++ b/Analysis/TrackInspect/CMakeLists.txt
@@ -1,18 +1,16 @@
-gaudi_subdir(TrackInspect v0r0)
-
-find_package(EDM4HEP REQUIRED) 
-find_package(AIDA REQUIRED)
-find_package(ROOT REQUIRED)
-find_package(CLHEP REQUIRED;CONFIG)
-
-gaudi_depends_on_subdirs(
-    Utilities/DataHelper
-)
-
-set(TrackInspect_srcs src/*.cpp)
 
 # Modules
-gaudi_add_module(TrackInspect ${TrackInspect_srcs}
-    INCLUDE_DIRS AIDA ROOT
-    LINK_LIBRARIES DataHelperLib GaudiKernel EDM4HEP ROOT ${CLHEP_LIBRARIES}
+gaudi_add_module(TrackInspect
+                 SOURCES src/TrackInspectAlg.cpp
+                 LINK DataHelperLib 
+                      Gaudi::GaudiKernel 
+                      EDM4HEP::edm4hep 
+                      ${ROOT_LIBRARIES}
+                      ${CLHEP_LIBRARIES}
 )
+
+install(TARGETS TrackInspect
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)