CMake: Cleanup targets with transitive dependencies

This commit is contained in:
tritao
2025-03-17 12:12:06 +00:00
parent 9a77120e82
commit cdab9c7837
69 changed files with 75 additions and 746 deletions

View File

@@ -1,3 +1,5 @@
add_library(Mesh SHARED)
if(WIN32)
add_definitions(-DFCAppMesh -DWM4_FOUNDATION_DLL_EXPORT)
endif(WIN32)
@@ -8,19 +10,14 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/3rdParty/libkdtree
)
include_directories(
target_include_directories(
Mesh
SYSTEM
${Boost_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
PUBLIC
${EIGEN3_INCLUDE_DIR}
)
set(Mesh_LIBS
${Boost_LIBRARIES}
FreeCADBase
FreeCADApp
)
@@ -417,7 +414,7 @@ if (EIGEN3_NO_DEPRECATED_COPY)
PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
endif ()
add_library(Mesh SHARED ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
target_sources(Mesh PRIVATE ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
target_link_libraries(Mesh ${Mesh_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(Mesh)

View File

@@ -2,18 +2,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}/Inventor/annex
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
if(MSVC)
include_directories(
${CMAKE_SOURCE_DIR}/src/3rdParty/OpenGL/api