diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 3c3a838c57d57460e47bd9c27ccb6c11e7ba8538..0fbf58c2e59cd6ed3c340c220e32e97b25ec633e 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(DataHelper)
 # add_subdirectory(KalDet)
-# add_subdirectory(KalTest)
+add_subdirectory(KalTest)
 # add_subdirectory(KiTrack)
 
diff --git a/Utilities/KalTest/CMakeLists.txt b/Utilities/KalTest/CMakeLists.txt
index 1b20a31d7280316c67d7ab12a05d23a0d31c633c..9adae9dc852f47043587a00978c1b82f9d2eee9d 100644
--- a/Utilities/KalTest/CMakeLists.txt
+++ b/Utilities/KalTest/CMakeLists.txt
@@ -3,15 +3,11 @@
 #    Desc: import from ILCSoft
 ##############################################################################
 
-gaudi_subdir(KalTest v0r0)
-
 find_package(ROOT REQUIRED COMPONENTS MathCore)
 
-gaudi_depends_on_subdirs()
-
 set( DICT_CINT_DEFINITIONS "HANDLE_DICT_EXCEPTIONS=IGNORED_FOR_CINT" )
 set( DICT_INPUT_DIRS geomlib kallib kaltracklib utils )
-set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rootdict )
+set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/rootdict )
 
 foreach( DICT ${DICT_INPUT_DIRS} )
   list( APPEND DICT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/${DICT} )
@@ -54,7 +50,13 @@ include_directories( ${ROOT_INCLUDE_DIRS} )
 
 set(KalTestLib_srcs ${LIB_SOURCES})
 
-gaudi_add_library(KalTestLib ${KalTestLib_srcs}
-			     PUBLIC_HEADERS kaltest
-			     LINK_LIBRARIES GaudiKernel ROOT
+gaudi_add_library(KalTestLib 
+                  SOURCES ${KalTestLib_srcs}
+		  LINK Gaudi::GaudiKernel
+                       ${ROOT_LIBRARIES}
 )
+install(TARGETS KalTestLib
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
diff --git a/cmake/CEPCSWConfig.cmake b/cmake/CEPCSWConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..4f9445ac3683765653b333811ce5ca8803cec5c6
--- /dev/null
+++ b/cmake/CEPCSWConfig.cmake
@@ -0,0 +1,13 @@
+include(CMakeFindDependencyMacro)
+find_dependency(podio REQUIRED)
+find_dependency(Gaudi REQUIRED)
+find_dependency(k4FWCore REQUIRED)
+find_dependency(EDM4HEP REQUIRED)
+find_dependency(ROOT REQUIRED)
+
+# - Include the targets file to create the imported targets that a client can
+# link to (libraries) or execute (programs)
+include("${CMAKE_CURRENT_LIST_DIR}/CEPCSWTargets.cmake")
+
+get_property(TEST_CEPCSW_LIBRARY TARGET CEPCSW::GeomSvc PROPERTY LOCATION)
+find_package_handle_standard_args(CEPCSW DEFAULT_MSG CMAKE_CURRENT_LIST_FILE TEST_CEPCSW_LIBRARY)