Merge pull request #19899 from tritao/cmake-cleanup-targets

CMake: Cleanup targets with transitive dependencies

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)

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