Merge pull request #23746 from 3x380V/cmake

CMake: Use scoped include and library directories
This commit is contained in:
Chris Hennes
2025-09-10 21:54:51 -05:00
committed by GitHub
45 changed files with 509 additions and 349 deletions

View File

@@ -11,7 +11,9 @@ if(BUILD_FEM_NETGEN)
add_definitions(-DHAVE_NETGEN)
endif(BUILD_FEM_NETGEN)
include_directories(
target_include_directories(
MeshPart
PRIVATE
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
)

View File

@@ -9,14 +9,6 @@ if(BUILD_FEM_NETGEN)
add_definitions(-DHAVE_NETGEN)
endif(BUILD_FEM_NETGEN)
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
)
link_directories(${SMESH_LIB_PATH})
set(MeshPartGui_LIBS
MeshPart
PartGui
@@ -74,6 +66,15 @@ if(FREECAD_USE_PCH)
endif(FREECAD_USE_PCH)
add_library(MeshPartGui SHARED ${MeshPartGui_SRCS} ${MeshPartGui_Scripts} ${FLATMESH_PY_SRCS})
target_include_directories(
MeshPartGui
PRIVATE
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
)
target_link_directories(MeshPartGui PUBLIC ${SMESH_LIB_PATH})
target_link_libraries(MeshPartGui ${MeshPartGui_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(MeshPartGui)