diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index bcf919f48ad021c0cb3558b803548058a2849623..49a6884ddbe855f7af9b81dd46948daae5f7ff59 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -11,7 +11,7 @@
 #==========================================================================
 dd4hep_package(    DDG4
   USES            [GEANT4 REQUIRED COMPONENTS gdml ui_all vis_all]
-                   DDCore
+                   BOOST DDCore
   OPTIONAL         CLHEP [XercesC QUIET]
   INCLUDE_DIRS     include
   INSTALL_INCLUDES include/DDG4)
diff --git a/DDRec/CMakeLists.txt b/DDRec/CMakeLists.txt
index 0a8daffd08926b71d8e1b05e8d0a8eb0acba78f0..99390e5a6242af6eeeb376a1f2c975fffec51cd5 100644
--- a/DDRec/CMakeLists.txt
+++ b/DDRec/CMakeLists.txt
@@ -17,6 +17,10 @@ dd4hep_package(DDRec
   INSTALL_INCLUDES include/DDRec)
 
 #---Add Library-------------------------------------------------------------
+if(DD4HEP_USE_GEAR)
+  add_definitions("-D DD4HEP_USE_GEAR")
+endif()
+
 dd4hep_add_package_library(DDRec 
   SOURCES        src/*.cpp 
   OPTIONAL       [GEAR COMPONENTS geartgeo SOURCES src/gear/DDGear.cpp DEFINITIONS DD4HEP_USE_GEAR ]
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index a5a02ee020343b0d844d1fff4906ee19ada365b2..27e256b8d4d6f1dca31c6f518ee01b12322df2a4 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -229,10 +229,10 @@ function ( dd4hep_find_packageEx PKG_NAME )
   # Propagate values to caller
   string ( TOUPPER "${pkg}" PKG )
   if ( "${pkg}" STREQUAL "${PKG}" )
-    set ( libs ${${PKG}_LIBRARIES} ${${pkg}_LIBRARY} ${${pkg}_LIBRARIES} )
+    set ( libs ${${PKG}_LIBRARIES} ${${pkg}_LIBRARY} ${${pkg}_LIBRARIES} ${${pkg}_COMPONENT_LIBRARIES} )
     set ( incs ${${PKG}_INCLUDE_DIRS} ${${pkg}_INCLUDE_DIR} ${${pkg}_INCLUDE_DIRS} )
   else()
-    set ( libs ${${PKG}_LIBRARIES} ${${pkg}_LIBRARY} ${${pkg}_LIBRARIES} ${${PKG}_LIBRARY} ${${PKG}_LIBRARIES} )
+    set ( libs ${${PKG}_LIBRARIES} ${${pkg}_LIBRARY} ${${pkg}_LIBRARIES} ${${PKG}_LIBRARY} ${${PKG}_LIBRARIES} ${${pkg}_COMPONENT_LIBRARIES} ${${PKG}_COMPONENT_LIBRARIES})
     set ( incs ${${PKG}_INCLUDE_DIRS} ${${pkg}_INCLUDE_DIR} ${${pkg}_INCLUDE_DIRS} ${${PKG}_INCLUDE_DIR} ${${PKG}_INCLUDE_DIRS} )
   endif()
   dd4hep_make_unique_list ( libs VALUES ${libs} )
@@ -956,6 +956,11 @@ function ( dd4hep_add_executable binary )
       dd4hep_debug ( "${tag} Executable optional: ${ARG_OPTIONAL}" )
       #
       get_property ( pkg_library GLOBAL PROPERTY ${pkg}_LIBRARIES )
+      message (STATUS "${tag}  ---> package ${pkg}_LIBRARIES libraries  ${pkg_library} " )
+  
+      string ( TOUPPER "${pkg}" PKG )
+      get_property ( pkg_library GLOBAL PROPERTY ${PKG}_LIBRARIES )
+      message (STATUS "${tag}  ---> package ${PKG}_LIBRARIES libraries  ${pkg_library} " )
       #
       #  Sources may also be supplied without argument tag:
       #
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 31e3bd371c2ff309e8ca1423569869fce9dcb46f..7f35cae3d0d94fc6a645acfe718fd951c02c1ad5 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -29,5 +29,6 @@ include ( ${DD4hep_DIR}/cmake/DD4hep.cmake )
 dd4hep_package ( DD4hepExample MAJOR 0 MINOR 0 PATCH 1 )
 #
 dd4hep_enable_tests (
-  AlignDet  CLICSiD  ClientTests SimpleDetector
+  AlignDet  CLICSiD  ClientTests 
 )
+#SimpleDetector