diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt
index a9e02d0c641a51843cb9c4544e7604b7e052ce11..411d44efa5a9b70c5555d94a7d98bdd75906419b 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt
@@ -35,3 +35,4 @@ set(PRIVATE_DEPENDENCIES
 
 generate_cbm_library()
 
+add_dependencies(G__NicaCbmCuts NICAFEMTO)
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt
index 3f1a22d3e71e5e5c145a21b5268df671892a306c..7b5f9ce8142066e2c0ef0409ebf9ce19df9c04fa 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt
@@ -67,3 +67,4 @@ set(PRIVATE_DEPENDENCIES
 
 generate_cbm_library()
 
+add_dependencies(G__NicaCbmFormat NICAFEMTO ANALYSISTREE)
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt
index ccb40945732a9dab12845bb5785156060ae9d271..26064f548fef7f4ffd45b12096c05cc0f6a108cc 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt
@@ -33,3 +33,4 @@ set(INTERFACE_DEPENDENCIES
 
 generate_cbm_library()
 
+add_dependencies(G__NicaCbmHelper NICAFEMTO)
diff --git a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
index 9fc86b4a5d026176b4703f84208a82bf2de2caec..0aa438f5b2b52c352bd581e10fa4cafa82a83723 100644
--- a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
@@ -62,4 +62,4 @@ set(INTERFACE_DEPENDENCIES
 
 generate_cbm_library()
 
-
+add_dependencies(G__CbmConversionAnalysis KFPARTICLE)
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 48ffe80d10a24f884bbf661036e946d0d78a3773..4a4ab75a2aaeacd4b56780ca861756ca756f5fe6 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -116,6 +116,7 @@ set(INTERFACE_DEPENDENCIES
 
 generate_cbm_library()
 
+add_dependencies(G__CbmPapa KFPARTICLE)
 
 install(FILES configs/Config_trd_PidLI.C
         DESTINATION share/cbmroot/macro/papa
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
index 75f598d1dd2065d5c080d4080031bec8445771a8..5d4375e11bee14ea48a1823e18f50536c5c71a88 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
@@ -74,5 +74,5 @@ set(INTERFACE_DEPENDENCIES
 
 generate_cbm_library()
 
-
+add_dependencies(G__CbmConversion2Analysis KFPARTICLE)
 
diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt
index 2028fb813c523a8b95d07f94bb817136566e33eb..3ea7fc00293c3d9ecf4f9394baa738cf97345086 100644
--- a/analysis/common/analysis_tree_converter/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/CMakeLists.txt
@@ -50,6 +50,9 @@ set(PRIVATE_DEPENDENCIES
 
 generate_cbm_library()
 
+add_dependencies(G__CbmAnalysisTreeInterface ANALYSISTREE)
+
+
 Install(FILES ../../../macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
         DESTINATION share/cbmroot/macro/analysis_tree
        )
diff --git a/analysis/common/at_kfpf_interface/CMakeLists.txt b/analysis/common/at_kfpf_interface/CMakeLists.txt
index d5b1fe1029bfe8cafccba11116f95ade186ed935..8aef1fdf8f12fa645b086136d54188c22517b80f 100644
--- a/analysis/common/at_kfpf_interface/CMakeLists.txt
+++ b/analysis/common/at_kfpf_interface/CMakeLists.txt
@@ -42,6 +42,8 @@ ADD_DEFINITIONS(${DEFINITIONS})
 
 generate_cbm_library()
 
+add_dependencies(G__AnalysisTreeKfpfInterface KFPARTICLE ANALYSISTREE)
+
 # Install(FILES ../../../macro/analysis/common/analysis_tree_converter/run_treemaker.C
 #         DESTINATION share/cbmroot/macro/analysis_tree
 #        )
diff --git a/reco/KF/KFParticleInterface.cmake b/reco/KF/KFParticleInterface.cmake
index bb74cf37c5ca9c1acc4f0614ca900fa5290b1d53..d5cd1748570371e7e51564e9c89483cdfd05f102 100644
--- a/reco/KF/KFParticleInterface.cmake
+++ b/reco/KF/KFParticleInterface.cmake
@@ -80,4 +80,4 @@ Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
 
 generate_cbm_library()
 
-Add_Dependencies(KFParticleInterface KFPARTICLE)
+add_dependencies(G__KFParticleInterface KFPARTICLE)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index fb8aaa2aad63b991f0924388e31c6084fab0b023..1dd572a61b4d98e4ae3e825b1147aad35b533054 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -186,6 +186,8 @@ set(PRIVATE_DEPENDENCIES
 
 generate_cbm_library()
 
+add_dependencies(G__L1 KFPARTICLE)
+
 install(FILES CbmL1Counters.h
               L1Algo/L1Assert.h
               L1Algo/L1EventEfficiencies.h