diff --git a/CMake/uLibGenerateDoc.cmake b/CMake/uLibGenerateDoc.cmake
index 7328d10..4988151 100644
--- a/CMake/uLibGenerateDoc.cmake
+++ b/CMake/uLibGenerateDoc.cmake
@@ -45,7 +45,9 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
      "WARN_IF_DOC_ERROR=YES\n"
      "WARN_FORMAT=\"$file:$line: $text\"\n"
      "INPUT=${CMAKE_CURRENT_SOURCE_DIR}/src\n"
-     "FILE_PATTERNS=*.cpp *.c *.h *.hpp\n"
+     "FILE_PATTERNS=*.h *.hpp\n"
+     "ENABLE_PREPROCESSING=YES\n"
+     "MACRO_EXPANSION=YES\n"
      "RECURSIVE=YES\n"
      "EXCLUDE_SYMLINKS=NO\n"
      "FILTER_SOURCE_FILES=NO\n"
diff --git a/CMake/uLibTargetMacros.cmake b/CMake/uLibTargetMacros.cmake
index 6dca895..3ee4087 100644
--- a/CMake/uLibTargetMacros.cmake
+++ b/CMake/uLibTargetMacros.cmake
@@ -28,15 +28,17 @@ macro(uLib_add_shared_library name)
   set(ULIB_SHARED_LIBRARIES ${shared} PARENT_SCOPE)
   source_group("${project_name}\\${name}" FILES ${SOURCES})
   set_target_properties(${mname} PROPERTIES
-                      VERSION ${PROJECT_VERSION}
-                      SOVERSION ${PROJECT_SOVERSION}
-                      INTERFACE_LINK_LIBRARIES "${LIBRARIES}"
-                      LINK_INTERFACE_LIBRARIES "${LIBRARIES}"          ## <- ok for cmake from  2.12 ?
-                      IMPORTED_LINK_INTERFACE_LIBRARIES "${LIBRARIES}" ## <- breaks cmake after 2.11 ?
-#                      PUBLIC_HEADER ""
+                        VERSION ${PROJECT_VERSION}
+                        SOVERSION ${PROJECT_SOVERSION}
+#                       INTERFACE_LINK_LIBRARIES "${LIBRARIES}"
+#                       LINK_INTERFACE_LIBRARIES "${LIBRARIES}"          ## <- ok for cmake from  2.12 ?
+#                       IMPORTED_LINK_INTERFACE_LIBRARIES "${LIBRARIES}" ## <- breaks cmake after 2.11 ?
+#                       PUBLIC_HEADER ""
   )
   debug(LIBRARIES)
 
+  target_link_libraries(${mname} ${LIBRARIES})
+
   install(TARGETS ${mname}
          EXPORT "${PROJECT_NAME}Targets"
          RUNTIME DESTINATION ${PACKAGE_INSTALL_BIN_DIR} COMPONENT bin
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b40ba4..f970e3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ include(uLibDebugMacro)
 include(uLibTargetMacros)
 include(uLibGenerateRMake)
 include(uLibGenerateRPMS)
-include(uLibGenerateDoc)
+#include(uLibGenerateDoc)
 
 
 ## GLOBALS ------------------------------------------------------------------ ##
diff --git a/Jenkinsfile b/Jenkinsfile
index 3ebc6bb..1f34447 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@ pipeline {
 
     agent {
         docker {
-            image 'infnpd/cmt-environment:latest-centos7'
+            image 'infnpd/cmt-environment:1.0-centos7'
             args '-u 0:0'
             label 'DOCKER'
         }
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
index 3e27cb6..f8ac196 100644
--- a/src/Core/CMakeLists.txt
+++ b/src/Core/CMakeLists.txt
@@ -38,8 +38,6 @@ set(LIBRARIES
        ${Boost_SIGNALS_LIBRARY}
        ${Boost_PROGRAM_OPTIONS_LIBRARY}
        ${ROOT_LIBRARIES}
-       ${PACKAGE_LIBPREFIX}Core
-       ${PACKAGE_LIBPREFIX}Math
 )
 
 uLib_add_shared_library(${uLib-module})
diff --git a/src/Detectors/CMakeLists.txt b/src/Detectors/CMakeLists.txt
index 3820ba9..6d74131 100644
--- a/src/Detectors/CMakeLists.txt
+++ b/src/Detectors/CMakeLists.txt
@@ -31,7 +31,6 @@ set(LIBRARIES
        ${ROOT_LIBRARIES}
        ${PACKAGE_LIBPREFIX}Core
        ${PACKAGE_LIBPREFIX}Math
-       ${PACKAGE_LIBPREFIX}Detectors
 )
 
 uLib_add_shared_library(${uLib-module})
diff --git a/src/Math/CMakeLists.txt b/src/Math/CMakeLists.txt
index 93e923b..c3e73b1 100644
--- a/src/Math/CMakeLists.txt
+++ b/src/Math/CMakeLists.txt
@@ -42,7 +42,6 @@ set(LIBRARIES
        ${Eigen_LIBRARY}
        ${ROOT_LIBRARIES}
        ${PACKAGE_LIBPREFIX}Core
-       ${PACKAGE_LIBPREFIX}Math
 )
 
 
diff --git a/src/Vtk/CMakeLists.txt b/src/Vtk/CMakeLists.txt
index c26cf09..ea20dd7 100644
--- a/src/Vtk/CMakeLists.txt
+++ b/src/Vtk/CMakeLists.txt
@@ -31,7 +31,6 @@ set(LIBRARIES
        ${PACKAGE_LIBPREFIX}Core
        ${PACKAGE_LIBPREFIX}Math
        ${PACKAGE_LIBPREFIX}Detectors
-       ${PACKAGE_LIBPREFIX}Vtk
 )
 
 uLib_add_shared_library(${uLib-module})