CMake: Cleanup targets with transitive dependencies

2025-03-17 12:12:06 +00:00
parent 5f623390fb
commit 6c2c6847eb
69 changed files with 75 additions and 746 deletions
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(FreeCADApp SHARED)
+
 if(WIN32)
    add_definitions(-DFCApp)
    add_definitions(-DBOOST_DYN_LINK)
@@ -59,16 +61,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-)
-
 set(FreeCADApp_LIBS
    FreeCADBase
    ${Boost_LIBRARIES}
@@ -350,7 +342,7 @@ if(FREECAD_USE_PCH)
    ADD_MSVC_PRECOMPILED_HEADER(FreeCADApp PreCompiled.h PreCompiled.cpp FreeCADApp_CPP_SRCS)
 endif(FREECAD_USE_PCH)

-add_library(FreeCADApp SHARED ${FreeCADApp_SRCS})
+target_sources(FreeCADApp PRIVATE ${FreeCADApp_SRCS})
 target_link_libraries(FreeCADApp ${FreeCADApp_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(FreeCADApp)
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(FreeCADBase SHARED)
+
 if(WIN32)
    add_definitions(-DFCBase)
    add_definitions(-DPYCXX_DLL)
@@ -16,14 +18,15 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
+target_include_directories(
+    FreeCADBase
    SYSTEM
+    PUBLIC
    ${Boost_INCLUDE_DIRS}
    ${PYCXX_INCLUDE_DIR}
    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
 )

@@ -353,8 +356,7 @@ if(FREECAD_USE_PCH)
    ADD_MSVC_PRECOMPILED_HEADER(FreeCADBase PreCompiled.h PreCompiled.cpp FreeCADBase_CPP_SRCS)
 endif(FREECAD_USE_PCH)

-add_library(FreeCADBase SHARED ${FreeCADBase_SRCS})
-
+target_sources(FreeCADBase PRIVATE ${FreeCADBase_SRCS})
 target_link_libraries(FreeCADBase ${FreeCADBase_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(FreeCADBase)
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(FreeCADGui SHARED)
+
 add_subdirectory(Stylesheets)
 add_subdirectory(PreferencePacks)
 add_subdirectory(PreferencePackTemplates)
@@ -63,15 +65,11 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}/DAGView
 )

-include_directories(
+target_include_directories(
+    FreeCADGui
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
+    PRIVATE
    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
    ${3DCONNEXION_INCLUDE_DIR}
 )

@@ -109,8 +107,8 @@ endif()
 if (TARGET Coin::Coin)
    list(APPEND FreeCADGui_LIBS Coin::Coin)
 else()
-    include_directories(SYSTEM ${COIN3D_INCLUDE_DIRS})
-    link_directories(${COIN3D_LIB_DIRS})
+    target_include_directories(FreeCADGui SYSTEM PUBLIC ${COIN3D_INCLUDE_DIRS})
+    target_link_directories(FreeCADGui PUBLIC ${COIN3D_LIB_DIRS})
    list(APPEND FreeCADGui_LIBS ${COIN3D_LIBRARIES})
 endif()

@@ -122,8 +120,10 @@ if (WIN32)
    endif()
 endif()

-include_directories(
+target_include_directories(
+    FreeCADGui
    SYSTEM
+    PUBLIC
    ${QtCore_INCLUDE_DIRS}
    ${QtWidgets_INCLUDE_DIRS}
    ${QtOpenGL_INCLUDE_DIRS}
@@ -146,8 +146,10 @@ list(APPEND FreeCADGui_LIBS
 )

 if(${Qt5WinExtras_FOUND})
-    include_directories(
+    target_include_directories(
+        FreeCADGui
        SYSTEM
+        PUBLIC
        ${Qt5WinExtras_INCLUDE_DIRS}
    )
    list(APPEND FreeCADGui_LIBS
@@ -1434,8 +1436,8 @@ if (EIGEN3_NO_DEPRECATED_COPY)
        PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
 endif ()

-add_library(FreeCADGui SHARED ${FreeCADGui_SRCS})
-target_link_libraries(FreeCADGui ${FreeCADGui_LIBS})
+target_sources(FreeCADGui PRIVATE ${FreeCADGui_SRCS})
+target_link_libraries(FreeCADGui PUBLIC ${FreeCADGui_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(FreeCADGui)
 endif()
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -3,30 +3,6 @@ configure_file(freecad.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/freecad.rc)
 configure_file(freecadCmd.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/freecadCmd.rc)
 file(COPY icon.ico DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

-if(BUILD_GUI)
-    include_directories(
-        SYSTEM
-        ${Boost_INCLUDE_DIRS}
-        ${COIN3D_INCLUDE_DIRS}
-        ${ZLIB_INCLUDE_DIR}
-        ${QtWidgets_INCLUDE_DIRS}
-        ${QT_INCLUDE_DIR}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-    )
-else(BUILD_GUI)
-    include_directories(
-        SYSTEM
-        ${Boost_INCLUDE_DIRS}
-        ${ZLIB_INCLUDE_DIR}
-        ${QT_INCLUDE_DIR}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-    )
-endif(BUILD_GUI)
-
 ######################## FreeCADMain ########################
 if(BUILD_GUI)

--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -6,14 +6,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Assembly_LIBS
    Part
    PartDesign
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -3,15 +3,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(AssemblyGui_LIBS
    Assembly
    PartDesign
--- a/src/Mod/CAM/App/CMakeLists.txt
+++ b/src/Mod/CAM/App/CMakeLists.txt
@@ -11,16 +11,9 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
-link_directories(${OCC_LIBRARY_DIR})

 set(Path_LIBS
    Part
--- a/src/Mod/CAM/Gui/CMakeLists.txt
+++ b/src/Mod/CAM/Gui/CMakeLists.txt
@@ -4,20 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(PathGui_LIBS
    Path
    PartGui
--- a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
+++ b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
@@ -6,18 +6,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(PathSimulator_LIBS
    Path
    Part
--- a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
+++ b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
@@ -5,21 +5,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(CAMSimulator_LIBS
    Path
    Part
--- a/src/Mod/CAM/libarea/CMakeLists.txt
+++ b/src/Mod/CAM/libarea/CMakeLists.txt
@@ -8,13 +8,6 @@ if(MSVC)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS /wd4244)
 endif(MSVC)

-include_directories(
-    SYSTEM
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-)
-
 include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src/Mod/Import/App/dxf
--- a/src/Mod/Cloud/App/CMakeLists.txt
+++ b/src/Mod/Cloud/App/CMakeLists.txt
@@ -4,13 +4,6 @@ endif()

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
    ${OPENSSL_INCLUDE_DIR}
    ${CURL_INCLUDE_DIR}
 )
--- a/src/Mod/Cloud/Gui/CMakeLists.txt
+++ b/src/Mod/Cloud/Gui/CMakeLists.txt
@@ -4,15 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
 set(CloudGui_LIBS
    Cloud
    FreeCADGui
--- a/src/Mod/Draft/App/CMakeLists.txt
+++ b/src/Mod/Draft/App/CMakeLists.txt
@@ -10,18 +10,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${QT_QTCORE_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(DraftUtils_LIBS
    Part
    FreeCADApp
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -2,17 +2,6 @@ include_directories(
    ${CMAKE_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Drawing_LIBS
    Part
    Spreadsheet
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -4,18 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(DrawingGui_LIBS
    Drawing
    FreeCADGui
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -24,19 +24,12 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
    ${SMESH_INCLUDE_DIR}
    ${NETGEN_INCLUDE_DIRS}
    ${VTK_INCLUDE_DIRS}
 )


-link_directories(${OCC_LIBRARY_DIR})
 link_directories(${SMESH_LIB_PATH})


--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -21,17 +21,10 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
    ${SMESH_INCLUDE_DIR}
    ${VTK_INCLUDE_DIRS}
 )

-link_directories(${OCC_LIBRARY_DIR})
 link_directories(${SMESH_LIB_PATH})

 set(FemGui_LIBS
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -4,18 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Import_LIBS
    Part
    ${OCC_OCAF_LIBRARIES}
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -3,19 +3,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(ImportGui_LIBS
    FreeCADGui
    PartGui
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -4,19 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Inspection_LIBS
    FreeCADApp
    Mesh
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -3,19 +3,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(InspectionGui_LIBS
    Inspection
    FreeCADGui
--- a/src/Mod/JtReader/App/CMakeLists.txt
+++ b/src/Mod/JtReader/App/CMakeLists.txt
@@ -6,17 +6,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(JtReader_LIBS
    Mesh
    ${OCC_LIBRARIES}
--- a/src/Mod/Material/App/CMakeLists.txt
+++ b/src/Mod/Material/App/CMakeLists.txt
@@ -16,18 +16,11 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
    ${YAML_CPP_INCLUDE_DIR}
 )
 link_directories(${YAML_CPP_LIBRARY_DIR})

 set(Materials_LIBS
-    ${Boost_LIBRARIES}
    FreeCADApp
 )

--- a/src/Mod/Material/Gui/CMakeLists.txt
+++ b/src/Mod/Material/Gui/CMakeLists.txt
@@ -11,19 +11,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(MatGui_LIBS
    Materials
    FreeCADGui
--- a/src/Mod/Measure/App/CMakeLists.txt
+++ b/src/Mod/Measure/App/CMakeLists.txt
@@ -5,17 +5,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Measure_LIBS
    Part
    FreeCADApp
--- a/src/Mod/Measure/Gui/CMakeLists.txt
+++ b/src/Mod/Measure/Gui/CMakeLists.txt
@@ -5,20 +5,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(MeasureGui_LIBS
    Measure
    #Part
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Mesh SHARED)
+
 if(WIN32)
    add_definitions(-DFCAppMesh -DWM4_FOUNDATION_DLL_EXPORT)
 endif(WIN32)
@@ -8,19 +10,14 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/src/3rdParty/libkdtree
 )

-include_directories(
+target_include_directories(
+    Mesh
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
+    PUBLIC
    ${EIGEN3_INCLUDE_DIR}
 )

 set(Mesh_LIBS
-    ${Boost_LIBRARIES}
    FreeCADBase
    FreeCADApp
 )
@@ -417,7 +414,7 @@ if (EIGEN3_NO_DEPRECATED_COPY)
        PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
 endif ()

-add_library(Mesh SHARED ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
+target_sources(Mesh PRIVATE ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
 target_link_libraries(Mesh ${Mesh_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(Mesh)
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -2,18 +2,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}/Inventor/annex
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 if(MSVC)
    include_directories(
        ${CMAKE_SOURCE_DIR}/src/3rdParty/OpenGL/api
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(MeshPart SHARED)
+
 if (SMESH_FOUND)
    add_definitions(-DHAVE_SMESH)
    if(SMESH_VERSION_MAJOR LESS_EQUAL 9 AND SMESH_VERSION_MINOR LESS 10 )
@@ -14,22 +16,22 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/src
 )

-include_directories(
+target_include_directories(
+    MeshPart
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
+    PUBLIC
    ${SMESH_INCLUDE_DIR}
    ${VTK_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
+)
+
+target_include_directories(
+    MeshPart
+    SYSTEM
+    PRIVATE
    ${pybind11_INCLUDE_DIR}
 )

-
-link_directories(${OCC_LIBRARY_DIR})
-link_directories(${SMESH_LIB_PATH})
+target_link_directories(MeshPart PUBLIC ${SMESH_LIB_PATH})

 set(MeshPart_LIBS
    Part
@@ -79,7 +81,7 @@ if (MINGW AND CMAKE_COMPILER_IS_CLANGXX)
    endif()
 endif()

-add_library(MeshPart SHARED ${MeshPart_SRCS} ${MeshPart_Scripts})
+target_sources(MeshPart PRIVATE ${MeshPart_SRCS} ${MeshPart_Scripts})
 target_link_libraries(MeshPart ${MeshPart_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(MeshPart)
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -15,17 +15,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
 link_directories(${SMESH_LIB_PATH})

 set(MeshPartGui_LIBS
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -1,6 +1,4 @@
-if(FREETYPE_FOUND)
-    add_definitions(-DFCUseFreeType)
-endif(FREETYPE_FOUND)
+add_library(Part SHARED)

 include_directories(
    ${CMAKE_BINARY_DIR}
@@ -9,20 +7,13 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
+target_include_directories(
+    Part
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
+    PUBLIC
    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${FREETYPE_INCLUDE_DIRS}
 )

-link_directories(${OCC_LIBRARY_DIR})
-
 set(Part_LIBS
    ${OCC_LIBRARIES}
    ${OCC_DEBUG_LIBRARIES}
@@ -30,7 +21,15 @@ set(Part_LIBS
    Materials
 )

+target_link_directories(Part PUBLIC ${OCC_LIBRARY_DIR})
+
 if(FREETYPE_FOUND)
+    add_definitions(-DFCUseFreeType)
+
+    include_directories(
+        ${FREETYPE_INCLUDE_DIRS}
+    )
+
    set(Part_LIBS
        ${Part_LIBS}
        ${FREETYPE_LIBRARIES}
@@ -606,7 +605,7 @@ if(EIGEN3_NO_DEPRECATED_COPY)
        PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
 endif()

-add_library(Part SHARED ${Part_SRCS} ${FCBRepAlgoAPI_SRCS})
+target_sources(Part PRIVATE ${Part_SRCS} ${FCBRepAlgoAPI_SRCS})
 target_link_libraries(Part ${Part_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(Part)
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -5,19 +5,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(PartGui_LIBS
    Part
    FreeCADGui
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -7,15 +7,6 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
 )
 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -6,18 +6,8 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
    ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
 )
-link_directories(${OCC_LIBRARY_DIR})

 generate_from_xml(ViewProviderPy)

--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Points SHARED)
+
 if(WIN32)
    add_definitions(-DFCAppPoints)
 endif(WIN32)
@@ -7,15 +9,11 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
+target_include_directories(
+    Points
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
+    PUBLIC
    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
    ${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format
    ${CMAKE_SOURCE_DIR}/src/3rdParty/libE57Format/include
 )
@@ -68,8 +66,7 @@ if(FREECAD_USE_PCH)
    ADD_MSVC_PRECOMPILED_HEADER(Points PreCompiled.h PreCompiled.cpp PCH_SRCS)
 endif(FREECAD_USE_PCH)

-add_library(Points SHARED ${Points_SRCS} ${Points_Scripts})
-
+target_sources(Points PRIVATE ${Points_SRCS} ${Points_Scripts})
 link_directories(${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format)

 target_link_libraries(Points E57Format ${Points_LIBS})
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -2,18 +2,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(PointsGui_LIBS
    Points
    FreeCADGui
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -24,20 +24,10 @@ include_directories(

 include_directories(
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
    ${PCL_INCLUDE_DIRS}
    ${FLANN_INCLUDE_DIRS}
 )

-link_directories(${OCC_LIBRARY_DIR})
-
 set(Reen_LIBS
    Part
    Mesh
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -4,19 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(ReenGui_LIBS
    ReverseEngineering
    MeshGui
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Robot SHARED)
+
 include_directories(
    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
@@ -5,18 +7,12 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
+target_include_directories(
+    Robot
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
+    PUBLIC
    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
-link_directories(${OCC_LIBRARY_DIR})

 set(Robot_LIBS
    Part
@@ -127,7 +123,7 @@ endif(FREECAD_USE_PCH)
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 SOURCE_GROUP("Module" FILES ${Mod_SRCS})

-add_library(Robot SHARED ${Robot_SRCS})
+target_sources(Robot PRIVATE ${Robot_SRCS})
 target_link_libraries(Robot ${Robot_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(Robot)
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -4,19 +4,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(RobotGui_LIBS
    Robot
    FreeCADGui
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -7,15 +7,6 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
 if (BUILD_QT5)
    include_directories(
        SYSTEM
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -3,18 +3,6 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/src/Gui
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 if(BUILD_QT5)
    include_directories(
        SYSTEM
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Sketcher SHARED)
+
 # Uncomment this code if you want to try Eigen's multithread
 #find_package(OpenMP)
 #if (OPENMP_FOUND)
@@ -16,18 +18,12 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}/..
 )

-include_directories(
+target_include_directories(
+    Sketcher
    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
+    PUBLIC
    ${EIGEN3_INCLUDE_DIR}
 )
-link_directories(${OCC_LIBRARY_DIR})

 set(Sketcher_LIBS
    Part
@@ -149,7 +145,7 @@ SET(Sketcher_PCH_SRCS
    ${Datatypes_SRCS}
 )

-add_library(Sketcher SHARED ${Sketcher_SRCS})
+target_sources(Sketcher PRIVATE ${Sketcher_SRCS})
 target_link_libraries(Sketcher ${Sketcher_LIBS})
 if (FREECAD_WARN_ERROR)
    target_compile_warn_error(Sketcher)
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -5,20 +5,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(SketcherGui_LIBS
    Sketcher
    PartGui
--- a/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -7,16 +7,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(Spreadsheet_LIBS
    FreeCADApp
 )
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -3,17 +3,6 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 generate_from_xml(ViewProviderSpreadsheetPy)

 # The XML files
--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -21,14 +21,6 @@
 #  *                                                                          *
 #  ***************************************************************************/

-include_directories(
-        SYSTEM
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${QtCore_INCLUDE_DIRS}
-        ${ZIPIOS_INCLUDES}
-)
-
 set(Start_LIBS
        FreeCADApp
        )
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -25,20 +25,6 @@ include_directories(
        ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-        SYSTEM
-        ${Boost_INCLUDE_DIRS}
-        ${COIN3D_INCLUDE_DIRS}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${QtCore_INCLUDE_DIRS}
-        ${QtSvg_INCLUDE_DIRS}
-        ${QtUiTools_INCLUDE_DIRS}
-        ${QtWidgets_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-        ${ZLIB_INCLUDE_DIR}
-)
-
 set(StartGui_LIBS
        Start
        FreeCADGui
--- a/src/Mod/Surface/App/CMakeLists.txt
+++ b/src/Mod/Surface/App/CMakeLists.txt
@@ -8,17 +8,9 @@ include_directories(

 include_directories(
  SYSTEM
-  ${Boost_INCLUDE_DIRS}
-  ${OCC_INCLUDE_DIR}
-  ${PYCXX_INCLUDE_DIR}
-  ${Python3_INCLUDE_DIRS}
-  ${ZLIB_INCLUDE_DIR}
-  ${XercesC_INCLUDE_DIRS}
  ${FREETYPE_INCLUDE_DIRS}
 )

-link_directories(${OCC_LIBRARY_DIR})
-
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Blending)

 generate_from_xml(Blending/BlendPointPy)
--- a/src/Mod/Surface/Gui/CMakeLists.txt
+++ b/src/Mod/Surface/Gui/CMakeLists.txt
@@ -6,17 +6,6 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
 set(SurfaceGui_LIBS
    Surface
    PartGui
--- a/src/Mod/TechDraw/App/CMakeLists.txt
+++ b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -7,17 +7,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(TechDrawLIBS
    Measure
    Part
@@ -43,8 +32,6 @@ list(APPEND TechDrawLIBS
    ${QtWidgets_LIBRARIES}
 )

-link_directories(${OCC_LIBRARY_DIR})
-
 generate_from_xml(DrawPagePy)
 generate_from_xml(DrawViewPy)
 generate_from_xml(DrawViewPartPy)
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -18,24 +18,10 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 # The XML files
 set(TechDrawGui_XML_SRCS
 )

-link_directories(${OCC_LIBRARY_DIR})
-
 set(TechDrawGui_LIBS
    TechDraw
    FreeCADGui
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -3,14 +3,6 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/src
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(TestGui_LIBS
    FreeCADGui
 )
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -1,17 +1,7 @@
-
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
 include_directories(
    SYSTEM
    ${QtNetwork_INCLUDE_DIRS}
--- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(_TEMPLATE__LIBS
    FreeCADApp
 )
--- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
@@ -1,19 +1,8 @@
-
 include_directories(
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
 )

-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(_TEMPLATE_Gui_LIBS
    _TEMPLATE_
    FreeCADGui
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,19 +69,10 @@ function(setup_qt_test)

        target_include_directories(${_testname}_Tests_run PUBLIC
            SYSTEM
-            ${PYCXX_INCLUDE_DIR}
-            ${Python3_INCLUDE_DIRS}
-            ${XercesC_INCLUDE_DIRS}
-            ${ZIPIOS_INCLUDES}
-            ${QtGui_INCLUDE_DIRS}
-            ${QtWidgets_INCLUDE_DIRS}
-            ${QtTest_INCLUDE_DIRS}
-            ${COIN3D_INCLUDE_DIRS})
+            ${QtTest_INCLUDE_DIRS})
        target_link_libraries(${_testname}_Tests_run
            FreeCADApp
            FreeCADGui
-            ${QtCore_LIBRARIES}
-            ${QtWidgets_LIBRARIES}
            ${QtTest_LIBRARIES}
            ${${_testname}_LIBS})
    endforeach()
@@ -135,12 +126,6 @@ if ( EXISTS "${CMAKE_SOURCE_DIR}/tests/lib/googletest" )
 endif()
 add_subdirectory(src)

-target_include_directories(Tests_run SYSTEM PUBLIC
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-)
 target_link_libraries(Tests_run
    gtest_main
    gmock_main
--- a/tests/src/Mod/Assembly/CMakeLists.txt
+++ b/tests/src/Mod/Assembly/CMakeLists.txt
@@ -1,17 +1,9 @@

-target_include_directories(Assembly_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
 if (NOT FREECAD_USE_EXTERNAL_ONDSELSOLVER)
 	target_include_directories(Assembly_tests_run PUBLIC
 		${CMAKE_SOURCE_DIR}/src/3rdParty/OndselSolver
 	)
 endif ()
-target_link_directories(Assembly_tests_run PUBLIC ${OCC_LIBRARY_DIR})

 target_link_libraries(Assembly_tests_run
    gtest_main
--- a/tests/src/Mod/Material/CMakeLists.txt
+++ b/tests/src/Mod/Material/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Material_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Material_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Material_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/Measure/CMakeLists.txt
+++ b/tests/src/Mod/Measure/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Measure_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Measure_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Measure_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/Mesh/CMakeLists.txt
+++ b/tests/src/Mod/Mesh/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-target_include_directories(Mesh_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-)
-target_link_directories(Mesh_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Mesh_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/MeshPart/CMakeLists.txt
+++ b/tests/src/Mod/MeshPart/CMakeLists.txt
@@ -1,15 +1,3 @@
-
-target_include_directories(MeshPart_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${SMESH_INCLUDE_DIR}
-    ${VTK_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(MeshPart_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(MeshPart_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/Part/App/FeatureExtrusion.cpp
+++ b/tests/src/Mod/Part/App/FeatureExtrusion.cpp
@@ -7,7 +7,6 @@
 #include "BRepBuilderAPI_MakeEdge.hxx"

 #include "PartTestHelpers.h"
-#include "Mod/Sketcher/App/SketchObject.h"

 class FeatureExtrusionTest: public ::testing::Test, public PartTestHelpers::PartTestHelperClass
 {
--- a/tests/src/Mod/Part/CMakeLists.txt
+++ b/tests/src/Mod/Part/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Part_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Part_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Part_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/PartDesign/CMakeLists.txt
+++ b/tests/src/Mod/PartDesign/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(PartDesign_tests_run SYSTEM PUBLIC
-        ${EIGEN3_INCLUDE_DIR}
-        ${OCC_INCLUDE_DIR}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(PartDesign_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(PartDesign_tests_run
        gtest_main
        ${Google_Tests_LIBS}
--- a/tests/src/Mod/Points/CMakeLists.txt
+++ b/tests/src/Mod/Points/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-target_include_directories(Points_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-)
-target_link_directories(Points_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Points_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/Sketcher/CMakeLists.txt
+++ b/tests/src/Mod/Sketcher/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Sketcher_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Sketcher_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Sketcher_tests_run
    gtest_main
    ${Google_Tests_LIBS}
--- a/tests/src/Mod/Spreadsheet/CMakeLists.txt
+++ b/tests/src/Mod/Spreadsheet/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-target_include_directories(Spreadsheet_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${SMESH_INCLUDE_DIR}
-    ${VTK_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 target_link_libraries(Spreadsheet_tests_run
    gtest_main
    ${Google_Tests_LIBS}