CMake: Replace include_directories with target_include_directories
This commit is contained in:
@@ -1,9 +1,3 @@
|
||||
include_directories(
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
set(Inspection_LIBS
|
||||
FreeCADApp
|
||||
Mesh
|
||||
@@ -30,6 +24,14 @@ if(FREECAD_USE_PCH)
|
||||
endif(FREECAD_USE_PCH)
|
||||
|
||||
add_library(Inspection SHARED ${Inspection_SRCS} ${Inspection_Scripts})
|
||||
target_include_directories(
|
||||
Inspection
|
||||
PRIVATE
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
target_link_libraries(Inspection ${Inspection_LIBS})
|
||||
if (FREECAD_WARN_ERROR)
|
||||
target_compile_warn_error(Inspection)
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
set(InspectionGui_LIBS
|
||||
Inspection
|
||||
FreeCADGui
|
||||
@@ -48,7 +43,19 @@ SET(InspectionGuiIcon_SVG
|
||||
Resources/icons/InspectionWorkbench.svg
|
||||
)
|
||||
|
||||
add_library(InspectionGui SHARED ${InspectionGui_SRCS} ${InspectionGui_Scripts} ${InspectionGuiIcon_SVG})
|
||||
add_library(InspectionGui SHARED
|
||||
${InspectionGui_SRCS}
|
||||
${InspectionGui_Scripts}
|
||||
${InspectionGuiIcon_SVG}
|
||||
)
|
||||
|
||||
target_include_directories(
|
||||
InspectionGui
|
||||
PRIVATE
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
target_link_libraries(InspectionGui ${InspectionGui_LIBS})
|
||||
if (FREECAD_WARN_ERROR)
|
||||
target_compile_warn_error(InspectionGui)
|
||||
|
||||
Reference in New Issue
Block a user