From 8a384a2b70c28a18153494ccc56e03c5c9344737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Matos?= Date: Sun, 19 Jan 2025 19:33:16 +0000 Subject: [PATCH] CMake: Improve Import dependency check for TechDraw module. (#19036) * CMake: Fix missing Import dependency check for TechDraw module. * CMake/TechDraw: Conditionally use Import library. * CMake: Fix missing dependency check for Module and PartDesign measure in TechDraw. --- cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake | 2 +- src/Mod/TechDraw/App/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake b/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake index c28bd1e28e..fae2b80f4f 100644 --- a/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake +++ b/cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake @@ -37,5 +37,5 @@ macro(CheckInterModuleDependencies) REQUIRES_MODS(BUILD_SANDBOX BUILD_PART BUILD_MESH) REQUIRES_MODS(BUILD_SKETCHER BUILD_PART) REQUIRES_MODS(BUILD_SPREADSHEET BUILD_DRAFT) - REQUIRES_MODS(BUILD_TECHDRAW BUILD_PART BUILD_SPREADSHEET) + REQUIRES_MODS(BUILD_TECHDRAW BUILD_PART BUILD_PART_DESIGN BUILD_SPREADSHEET BUILD_MEASURE BUILD_IMPORT) endmacro(CheckInterModuleDependencies) diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 5cf6d234b8..c70fd08f17 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -16,10 +16,13 @@ set(TechDrawLIBS Measure Part Spreadsheet - Import PartDesign ) +if (BUILD_IMPORT) + list(APPEND TechDrawLIBS Import) +endif () + include_directories( ${QtConcurrent_INCLUDE_DIRS} ${QtCore_INCLUDE_DIR}