Merge pull request #23746 from 3x380V/cmake

CMake: Use scoped include and library directories

src/Mod/Assembly/App/CMakeLists.txt

@@ -1,17 +1,10 @@
 
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 set(Assembly_LIBS
     Part
     PartDesign
-	Spreadsheet
+    Spreadsheet
     FreeCADApp
-	OndselSolver
+    OndselSolver
 )
 
 generate_from_py(AssemblyObject)
@@ -71,6 +64,14 @@ SET(Assembly_SRCS
 )
 
 add_library(Assembly SHARED ${Assembly_SRCS})
+target_include_directories(
+    Assembly
+    PRIVATE
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_BINARY_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
 target_link_libraries(Assembly ${Assembly_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(Assembly)

src/Mod/Assembly/Gui/CMakeLists.txt

@@ -1,7 +1,3 @@
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
 
 set(AssemblyGui_LIBS
     Assembly
@@ -85,6 +81,13 @@ SET(AssemblyGuiIcon_SVG
 
 add_library(AssemblyGui SHARED ${AssemblyGui_SRCS} ${AssemblyGuiIcon_SVG})
 
+target_include_directories(
+    AssemblyGui
+    PRIVATE
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 if(WIN32)
     target_compile_definitions(AssemblyGui PRIVATE _USE_MATH_DEFINES)
 endif(WIN32)