CMake: Replace include_directories with target_include_directories

src/Mod/Surface/App/CMakeLists.txt

@@ -1,16 +1,3 @@
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-include_directories(
-  SYSTEM
-  ${FREETYPE_INCLUDE_DIRS}
-)
-
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Blending)
 
 generate_from_py(Blending/BlendPoint)
@@ -67,6 +54,23 @@ endif(FREECAD_USE_PCH)
 
 link_directories(${OCC_LIBRARY_DIR})
 add_library(Surface SHARED ${Surface_SRCS})
+target_include_directories(
+    Surface
+    PRIVATE
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_include_directories(
+    Surface
+    SYSTEM
+    PUBLIC
+    ${FREETYPE_INCLUDE_DIRS}
+)
+
 target_link_libraries(Surface ${Surface_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(Surface)

src/Mod/Surface/Gui/CMakeLists.txt

@@ -1,11 +1,3 @@
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 set(SurfaceGui_LIBS
     Surface
     PartGui
@@ -67,7 +59,21 @@ if(FREECAD_USE_PCH)
 endif(FREECAD_USE_PCH)
 
 link_directories(${OCC_LIBRARY_DIR})
-add_library(SurfaceGui SHARED ${SurfaceGui_SRCS} ${SurfaceGuiIcon_SVG})
+add_library(SurfaceGui SHARED
+    ${SurfaceGui_SRCS}
+    ${SurfaceGuiIcon_SVG}
+)
+
+target_include_directories(
+    SurfaceGui
+    PRIVATE
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_BINARY_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 target_link_libraries(SurfaceGui ${SurfaceGui_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(SurfaceGui)