kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #19899 from tritao/cmake-cleanup-targets

Browse Source 
CMake: Cleanup targets with transitive dependencies
This commit is contained in:
Chris Hennes
2025-03-17 13:15:37 -05:00
committed by GitHub
parent f8be6f5233 6c2c6847eb
commit e574fa1efc
69 changed files with 75 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Assembly/App/CMakeLists.txt
View File

@@ -6,14 +6,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Assembly_LIBS
Part
PartDesign

9
src/Mod/Assembly/Gui/CMakeLists.txt
View File

@@ -3,15 +3,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(AssemblyGui_LIBS
Assembly
PartDesign

7
src/Mod/CAM/App/CMakeLists.txt
View File

@@ -11,16 +11,9 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Path_LIBS
Part

14
src/Mod/CAM/Gui/CMakeLists.txt
View File

@@ -4,20 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(PathGui_LIBS
Path
PartGui

12
src/Mod/CAM/PathSimulator/App/CMakeLists.txt
View File

@@ -6,18 +6,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(PathSimulator_LIBS
Path
Part

15
src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
View File

@@ -5,21 +5,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(CAMSimulator_LIBS
Path
Part

7
src/Mod/CAM/libarea/CMakeLists.txt
View File

@@ -8,13 +8,6 @@ if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS /wd4244)
endif(MSVC)
include_directories(
SYSTEM
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/Mod/Import/App/dxf

7
src/Mod/Cloud/App/CMakeLists.txt
View File

@@ -4,13 +4,6 @@ endif()
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIR}
${CURL_INCLUDE_DIR}
)

9
src/Mod/Cloud/Gui/CMakeLists.txt
View File

@@ -4,15 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
)
set(CloudGui_LIBS
Cloud
FreeCADGui

12
src/Mod/Draft/App/CMakeLists.txt
View File

@@ -10,18 +10,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${QT_QTCORE_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
set(DraftUtils_LIBS
Part
FreeCADApp

11
src/Mod/Drawing/App/CMakeLists.txt
View File

@@ -2,17 +2,6 @@ include_directories(
${CMAKE_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Drawing_LIBS
Part
Spreadsheet

12
src/Mod/Drawing/Gui/CMakeLists.txt
View File

@@ -4,18 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(DrawingGui_LIBS
Drawing
FreeCADGui

7
src/Mod/Fem/App/CMakeLists.txt
View File

@@ -24,19 +24,12 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}
${NETGEN_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
link_directories(${SMESH_LIB_PATH})

7
src/Mod/Fem/Gui/CMakeLists.txt
View File

@@ -21,17 +21,10 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${SMESH_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
link_directories(${SMESH_LIB_PATH})
set(FemGui_LIBS

12
src/Mod/Import/App/CMakeLists.txt
View File

@@ -4,18 +4,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Import_LIBS
Part
${OCC_OCAF_LIBRARIES}

13
src/Mod/Import/Gui/CMakeLists.txt
View File

@@ -3,19 +3,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(ImportGui_LIBS
FreeCADGui
PartGui

13
src/Mod/Inspection/App/CMakeLists.txt
View File

@@ -4,19 +4,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Inspection_LIBS
FreeCADApp
Mesh

13
src/Mod/Inspection/Gui/CMakeLists.txt
View File

@@ -3,19 +3,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
set(InspectionGui_LIBS
Inspection
FreeCADGui

11
src/Mod/JtReader/App/CMakeLists.txt
View File

@@ -6,17 +6,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(JtReader_LIBS
Mesh
${OCC_LIBRARIES}

7
src/Mod/Material/App/CMakeLists.txt
View File

@@ -16,18 +16,11 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${YAML_CPP_INCLUDE_DIR}
)
link_directories(${YAML_CPP_LIBRARY_DIR})
set(Materials_LIBS
${Boost_LIBRARIES}
FreeCADApp
)

13
src/Mod/Material/Gui/CMakeLists.txt
View File

@@ -11,19 +11,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
set(MatGui_LIBS
Materials
FreeCADGui

11
src/Mod/Measure/App/CMakeLists.txt
View File

@@ -5,17 +5,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Measure_LIBS
Part
FreeCADApp

14
src/Mod/Measure/Gui/CMakeLists.txt
View File

@@ -5,20 +5,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
link_directories(${OCC_LIBRARY_DIR})
set(MeasureGui_LIBS
Measure
#Part

15
src/Mod/Mesh/App/CMakeLists.txt
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)

12
src/Mod/Mesh/Gui/CMakeLists.txt
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

24
src/Mod/MeshPart/App/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
add_library(MeshPart SHARED)
if (SMESH_FOUND)
add_definitions(-DHAVE_SMESH)
if(SMESH_VERSION_MAJOR LESS_EQUAL 9 AND SMESH_VERSION_MINOR LESS 10 )
@@ -14,22 +16,22 @@ include_directories(
${CMAKE_SOURCE_DIR}/src
)
include_directories(
target_include_directories(
MeshPart
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
PUBLIC
${SMESH_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
)
target_include_directories(
MeshPart
SYSTEM
PRIVATE
${pybind11_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
link_directories(${SMESH_LIB_PATH})
target_link_directories(MeshPart PUBLIC ${SMESH_LIB_PATH})
set(MeshPart_LIBS
Part
@@ -79,7 +81,7 @@ if (MINGW AND CMAKE_COMPILER_IS_CLANGXX)
endif()
endif()
add_library(MeshPart SHARED ${MeshPart_SRCS} ${MeshPart_Scripts})
target_sources(MeshPart PRIVATE ${MeshPart_SRCS} ${MeshPart_Scripts})
target_link_libraries(MeshPart ${MeshPart_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(MeshPart)

11
src/Mod/MeshPart/Gui/CMakeLists.txt
View File

@@ -15,17 +15,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
link_directories(${SMESH_LIB_PATH})
set(MeshPartGui_LIBS

27
src/Mod/Part/App/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
if(FREETYPE_FOUND)
add_definitions(-DFCUseFreeType)
endif(FREETYPE_FOUND)
add_library(Part SHARED)
include_directories(
${CMAKE_BINARY_DIR}
@@ -9,20 +7,13 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
target_include_directories(
Part
SYSTEM
${Boost_INCLUDE_DIRS}
PUBLIC
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${FREETYPE_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Part_LIBS
${OCC_LIBRARIES}
${OCC_DEBUG_LIBRARIES}
@@ -30,7 +21,15 @@ set(Part_LIBS
Materials
)
target_link_directories(Part PUBLIC ${OCC_LIBRARY_DIR})
if(FREETYPE_FOUND)
add_definitions(-DFCUseFreeType)
include_directories(
${FREETYPE_INCLUDE_DIRS}
)
set(Part_LIBS
${Part_LIBS}
${FREETYPE_LIBRARIES}
@@ -606,7 +605,7 @@ if(EIGEN3_NO_DEPRECATED_COPY)
PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
endif()
add_library(Part SHARED ${Part_SRCS} ${FCBRepAlgoAPI_SRCS})
target_sources(Part PRIVATE ${Part_SRCS} ${FCBRepAlgoAPI_SRCS})
target_link_libraries(Part ${Part_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(Part)

13
src/Mod/Part/Gui/CMakeLists.txt
View File

@@ -5,19 +5,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
set(PartGui_LIBS
Part
FreeCADGui

9
src/Mod/PartDesign/App/CMakeLists.txt
View File

@@ -7,15 +7,6 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
)
link_directories(${OCC_LIBRARY_DIR})

10
src/Mod/PartDesign/Gui/CMakeLists.txt
View File

@@ -6,18 +6,8 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
)
link_directories(${OCC_LIBRARY_DIR})
generate_from_xml(ViewProviderPy)

15
src/Mod/Points/App/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
add_library(Points SHARED)
if(WIN32)
add_definitions(-DFCAppPoints)
endif(WIN32)
@@ -7,15 +9,11 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
target_include_directories(
Points
SYSTEM
${Boost_INCLUDE_DIRS}
PUBLIC
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format
${CMAKE_SOURCE_DIR}/src/3rdParty/libE57Format/include
)
@@ -68,8 +66,7 @@ if(FREECAD_USE_PCH)
ADD_MSVC_PRECOMPILED_HEADER(Points PreCompiled.h PreCompiled.cpp PCH_SRCS)
endif(FREECAD_USE_PCH)
add_library(Points SHARED ${Points_SRCS} ${Points_Scripts})
target_sources(Points PRIVATE ${Points_SRCS} ${Points_Scripts})
link_directories(${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format)
target_link_libraries(Points E57Format ${Points_LIBS})

12
src/Mod/Points/Gui/CMakeLists.txt
View File

@@ -2,18 +2,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(PointsGui_LIBS
Points
FreeCADGui

10
src/Mod/ReverseEngineering/App/CMakeLists.txt
View File

@@ -24,20 +24,10 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PCL_INCLUDE_DIRS}
${FLANN_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Reen_LIBS
Part
Mesh

13
src/Mod/ReverseEngineering/Gui/CMakeLists.txt
View File

@@ -4,19 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${COIN3D_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(ReenGui_LIBS
ReverseEngineering
MeshGui

16
src/Mod/Robot/App/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
add_library(Robot SHARED)
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
@@ -5,18 +7,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
target_include_directories(
Robot
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
PUBLIC
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(Robot_LIBS
Part
@@ -127,7 +123,7 @@ endif(FREECAD_USE_PCH)
SOURCE_GROUP("Python" FILES ${Python_SRCS})
SOURCE_GROUP("Module" FILES ${Mod_SRCS})
add_library(Robot SHARED ${Robot_SRCS})
target_sources(Robot PRIVATE ${Robot_SRCS})
target_link_libraries(Robot ${Robot_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(Robot)

13
src/Mod/Robot/Gui/CMakeLists.txt
View File

@@ -4,19 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
set(RobotGui_LIBS
Robot
FreeCADGui

9
src/Mod/Sandbox/App/CMakeLists.txt
View File

@@ -7,15 +7,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
if (BUILD_QT5)
include_directories(
SYSTEM

12
src/Mod/Sandbox/Gui/CMakeLists.txt
View File

@@ -3,18 +3,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/Gui
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
if(BUILD_QT5)
include_directories(
SYSTEM

16
src/Mod/Sketcher/App/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
add_library(Sketcher SHARED)
# Uncomment this code if you want to try Eigen's multithread
#find_package(OpenMP)
#if (OPENMP_FOUND)
@@ -16,18 +18,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/..
)
include_directories(
target_include_directories(
Sketcher
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
PUBLIC
${EIGEN3_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
set(Sketcher_LIBS
Part
@@ -149,7 +145,7 @@ SET(Sketcher_PCH_SRCS
${Datatypes_SRCS}
)
add_library(Sketcher SHARED ${Sketcher_SRCS})
target_sources(Sketcher PRIVATE ${Sketcher_SRCS})
target_link_libraries(Sketcher ${Sketcher_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(Sketcher)

14
src/Mod/Sketcher/Gui/CMakeLists.txt
View File

@@ -5,20 +5,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${COIN3D_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
)
link_directories(${OCC_LIBRARY_DIR})
set(SketcherGui_LIBS
Sketcher
PartGui

10
src/Mod/Spreadsheet/App/CMakeLists.txt
View File

@@ -7,16 +7,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(Spreadsheet_LIBS
FreeCADApp
)

11
src/Mod/Spreadsheet/Gui/CMakeLists.txt
View File

@@ -3,17 +3,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
generate_from_xml(ViewProviderSpreadsheetPy)
# The XML files

8
src/Mod/Start/App/CMakeLists.txt
View File

@@ -21,14 +21,6 @@
# * *
# ***************************************************************************/
include_directories(
SYSTEM
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${QtCore_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
)
set(Start_LIBS
FreeCADApp
)

14
src/Mod/Start/Gui/CMakeLists.txt
View File

@@ -25,20 +25,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${QtCore_INCLUDE_DIRS}
${QtSvg_INCLUDE_DIRS}
${QtUiTools_INCLUDE_DIRS}
${QtWidgets_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
set(StartGui_LIBS
Start
FreeCADGui

8
src/Mod/Surface/App/CMakeLists.txt
View File

@@ -8,17 +8,9 @@ include_directories(
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Blending)
generate_from_xml(Blending/BlendPointPy)

11
src/Mod/Surface/Gui/CMakeLists.txt
View File

@@ -6,17 +6,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
set(SurfaceGui_LIBS
Surface
PartGui

13
src/Mod/TechDraw/App/CMakeLists.txt
View File

@@ -7,17 +7,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
set(TechDrawLIBS
Measure
Part
@@ -43,8 +32,6 @@ list(APPEND TechDrawLIBS
${QtWidgets_LIBRARIES}
)
link_directories(${OCC_LIBRARY_DIR})
generate_from_xml(DrawPagePy)
generate_from_xml(DrawViewPy)
generate_from_xml(DrawViewPartPy)

14
src/Mod/TechDraw/Gui/CMakeLists.txt
View File

@@ -18,24 +18,10 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
# The XML files
set(TechDrawGui_XML_SRCS
)
link_directories(${OCC_LIBRARY_DIR})
set(TechDrawGui_LIBS
TechDraw
FreeCADGui

8
src/Mod/Test/Gui/CMakeLists.txt
View File

@@ -3,14 +3,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
set(TestGui_LIBS
FreeCADGui
)

10
src/Mod/Web/App/CMakeLists.txt
View File

@@ -1,17 +1,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories(
SYSTEM
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
${Python3_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
include_directories(
SYSTEM
${QtNetwork_INCLUDE_DIRS}