From 93830929ae61792d80fefe1e53200d718afab9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Reitb=C3=B6ck?= Date: Sun, 21 Sep 2025 16:20:36 +0200 Subject: [PATCH] Measure: use CMake to generate precompiled headers on all platforms "Professional CMake" book suggest the following: "Targets should build successfully with or without compiler support for precompiled headers. It should be considered an optimization, not a requirement. In particular, do not explicitly include a precompile header (e.g. stdafx.h) in the source code, let CMake force-include an automatically generated precompile header on the compiler command line instead. This is more portable across the major compilers and is likely to be easier to maintain. It will also avoid warnings being generated from certain code checking tools like iwyu (include what you use)." Therefore, removed the "#include " from sources, also there is no need for the "#ifdef _PreComp_" anymore --- src/Mod/Measure/App/AppMeasure.cpp | 2 +- src/Mod/Measure/App/AppMeasurePy.cpp | 5 ---- src/Mod/Measure/App/CMakeLists.txt | 13 +++++------ src/Mod/Measure/App/MeasureAngle.cpp | 2 -- src/Mod/Measure/App/MeasureArea.cpp | 2 -- src/Mod/Measure/App/MeasureBase.cpp | 2 +- src/Mod/Measure/App/MeasureBasePyImp.cpp | 1 - src/Mod/Measure/App/MeasureDistance.cpp | 2 -- src/Mod/Measure/App/MeasureLength.cpp | 2 -- src/Mod/Measure/App/MeasurePosition.cpp | 2 -- src/Mod/Measure/App/MeasureRadius.cpp | 2 -- src/Mod/Measure/App/Measurement.cpp | 3 --- src/Mod/Measure/App/MeasurementPyImp.cpp | 4 +--- src/Mod/Measure/App/PreCompiled.cpp | 23 ------------------- src/Mod/Measure/App/PreCompiled.h | 3 --- src/Mod/Measure/App/Preferences.cpp | 4 +--- src/Mod/Measure/App/ShapeFinder.cpp | 4 ---- src/Mod/Measure/App/SubnameHelper.cpp | 4 ---- src/Mod/Measure/Gui/AppMeasureGui.cpp | 4 +--- src/Mod/Measure/Gui/CMakeLists.txt | 14 +++++------ src/Mod/Measure/Gui/Command.cpp | 3 --- .../Gui/DlgPrefsMeasureAppearanceImp.cpp | 1 - src/Mod/Measure/Gui/PreCompiled.cpp | 22 ------------------ src/Mod/Measure/Gui/PreCompiled.h | 4 ---- src/Mod/Measure/Gui/QuickMeasure.cpp | 4 +--- src/Mod/Measure/Gui/QuickMeasurePyImp.cpp | 4 ---- src/Mod/Measure/Gui/TaskMeasure.cpp | 4 ---- .../Measure/Gui/ViewProviderMeasureAngle.cpp | 4 +--- .../Measure/Gui/ViewProviderMeasureBase.cpp | 4 +--- .../Gui/ViewProviderMeasureDistance.cpp | 4 +--- 30 files changed, 22 insertions(+), 130 deletions(-) delete mode 100644 src/Mod/Measure/App/PreCompiled.cpp delete mode 100644 src/Mod/Measure/Gui/PreCompiled.cpp diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp index 3e71e5c6f6..1c165faf48 100644 --- a/src/Mod/Measure/App/AppMeasure.cpp +++ b/src/Mod/Measure/App/AppMeasure.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include #include #include diff --git a/src/Mod/Measure/App/AppMeasurePy.cpp b/src/Mod/Measure/App/AppMeasurePy.cpp index f960c40073..ca88c173d4 100644 --- a/src/Mod/Measure/App/AppMeasurePy.cpp +++ b/src/Mod/Measure/App/AppMeasurePy.cpp @@ -21,11 +21,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ - -#endif #include #include // clears "include what you use" lint message, but creates "included header not used" diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index 502fa08afd..3cce71d004 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -15,7 +15,6 @@ SET(Python_SRCS SOURCE_GROUP("Python" FILES ${Python_SRCS}) SET(MeasureModule_SRCS - PreCompiled.cpp PreCompiled.h AppMeasure.cpp AppMeasurePy.cpp @@ -56,14 +55,14 @@ SET(Measure_SRCS ${Python_SRCS} ) -if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" Measure_CPP_SRCS ${Measure_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(Measure PreCompiled.h PreCompiled.cpp Measure_CPP_SRCS) -endif(FREECAD_USE_PCH) - add_library(Measure SHARED ${Measure_SRCS}) +if(FREECAD_USE_PCH) + target_precompile_headers(Measure PRIVATE + $<$:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h"> + ) +endif(FREECAD_USE_PCH) + target_include_directories( Measure PRIVATE diff --git a/src/Mod/Measure/App/MeasureAngle.cpp b/src/Mod/Measure/App/MeasureAngle.cpp index 5e72fbe5b4..88c85d91d6 100644 --- a/src/Mod/Measure/App/MeasureAngle.cpp +++ b/src/Mod/Measure/App/MeasureAngle.cpp @@ -20,8 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Mod/Measure/App/MeasureArea.cpp b/src/Mod/Measure/App/MeasureArea.cpp index 474c11a7cd..a6f640e23a 100644 --- a/src/Mod/Measure/App/MeasureArea.cpp +++ b/src/Mod/Measure/App/MeasureArea.cpp @@ -20,8 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Mod/Measure/App/MeasureBase.cpp b/src/Mod/Measure/App/MeasureBase.cpp index 0a6fb205c9..0535502fc9 100644 --- a/src/Mod/Measure/App/MeasureBase.cpp +++ b/src/Mod/Measure/App/MeasureBase.cpp @@ -19,7 +19,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" +#include #include #include diff --git a/src/Mod/Measure/App/MeasureBasePyImp.cpp b/src/Mod/Measure/App/MeasureBasePyImp.cpp index 8230138093..0292b61115 100644 --- a/src/Mod/Measure/App/MeasureBasePyImp.cpp +++ b/src/Mod/Measure/App/MeasureBasePyImp.cpp @@ -1,4 +1,3 @@ -#include "PreCompiled.h" #include "MeasureBase.h" diff --git a/src/Mod/Measure/App/MeasureDistance.cpp b/src/Mod/Measure/App/MeasureDistance.cpp index 2702860f8c..12263d2a89 100644 --- a/src/Mod/Measure/App/MeasureDistance.cpp +++ b/src/Mod/Measure/App/MeasureDistance.cpp @@ -20,8 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Mod/Measure/App/MeasureLength.cpp b/src/Mod/Measure/App/MeasureLength.cpp index f2e5ccc49b..f8d7f718ca 100644 --- a/src/Mod/Measure/App/MeasureLength.cpp +++ b/src/Mod/Measure/App/MeasureLength.cpp @@ -20,8 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Mod/Measure/App/MeasurePosition.cpp b/src/Mod/Measure/App/MeasurePosition.cpp index 8c871c29fa..f6ca40a95f 100644 --- a/src/Mod/Measure/App/MeasurePosition.cpp +++ b/src/Mod/Measure/App/MeasurePosition.cpp @@ -20,8 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Mod/Measure/App/MeasureRadius.cpp b/src/Mod/Measure/App/MeasureRadius.cpp index 5fb3c6206b..0b28d2e115 100644 --- a/src/Mod/Measure/App/MeasureRadius.cpp +++ b/src/Mod/Measure/App/MeasureRadius.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include #include diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index 6d0e21c985..7ea67b0ad1 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -38,7 +36,6 @@ #include #include #include -#endif #include diff --git a/src/Mod/Measure/App/MeasurementPyImp.cpp b/src/Mod/Measure/App/MeasurementPyImp.cpp index ec2fe97ce4..eb2fc1d581 100644 --- a/src/Mod/Measure/App/MeasurementPyImp.cpp +++ b/src/Mod/Measure/App/MeasurementPyImp.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Mod/Measure/App/PreCompiled.cpp b/src/Mod/Measure/App/PreCompiled.cpp deleted file mode 100644 index cde4369c5b..0000000000 --- a/src/Mod/Measure/App/PreCompiled.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#include "PreCompiled.h" diff --git a/src/Mod/Measure/App/PreCompiled.h b/src/Mod/Measure/App/PreCompiled.h index ee6e3a5092..d299b3a595 100644 --- a/src/Mod/Measure/App/PreCompiled.h +++ b/src/Mod/Measure/App/PreCompiled.h @@ -27,7 +27,6 @@ #include -#ifdef _PreComp_ // standard #include @@ -43,6 +42,4 @@ #include -#endif //_PreComp_ - #endif // MEASUREGUI_PRECOMPILED_H diff --git a/src/Mod/Measure/App/Preferences.cpp b/src/Mod/Measure/App/Preferences.cpp index 17972acdd2..2b6bd891e4 100644 --- a/src/Mod/Measure/App/Preferences.cpp +++ b/src/Mod/Measure/App/Preferences.cpp @@ -19,10 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Mod/Measure/App/ShapeFinder.cpp b/src/Mod/Measure/App/ShapeFinder.cpp index fa22f96f7e..dbaff7058d 100644 --- a/src/Mod/Measure/App/ShapeFinder.cpp +++ b/src/Mod/Measure/App/ShapeFinder.cpp @@ -26,10 +26,6 @@ //! and its placement. -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Measure/App/SubnameHelper.cpp b/src/Mod/Measure/App/SubnameHelper.cpp index b929e605b8..c3e0ffca0a 100644 --- a/src/Mod/Measure/App/SubnameHelper.cpp +++ b/src/Mod/Measure/App/SubnameHelper.cpp @@ -24,10 +24,6 @@ //! a class to perform common operations on subelement names. -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Measure/Gui/AppMeasureGui.cpp b/src/Mod/Measure/Gui/AppMeasureGui.cpp index 65f77deb8e..135126fbc0 100644 --- a/src/Mod/Measure/Gui/AppMeasureGui.cpp +++ b/src/Mod/Measure/Gui/AppMeasureGui.cpp @@ -19,10 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include #include diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt index a65e505edc..7e0789d8b4 100644 --- a/src/Mod/Measure/Gui/CMakeLists.txt +++ b/src/Mod/Measure/Gui/CMakeLists.txt @@ -29,7 +29,6 @@ SET(MeasureGui_SRCS AppMeasureGui.cpp Command.cpp Resources/Measure.qrc - PreCompiled.cpp PreCompiled.h QuickMeasure.pyi QuickMeasurePyImp.cpp @@ -58,17 +57,18 @@ SET(MeasureGuiTaskDlgs_SRCS # ../InitGui.py #) -if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${MeasureGui_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(MeasureGui PreCompiled.h PreCompiled.cpp PCH_SRCS) -endif(FREECAD_USE_PCH) - SET(MeasureGuiIcon_SVG Resources/icons/preferences-measure.svg ) add_library(MeasureGui SHARED ${MeasureGui_SRCS} ${MeasureGuiIcon_SVG}) + +if(FREECAD_USE_PCH) + target_precompile_headers(MeasureGui PRIVATE + $<$:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h"> + ) +endif(FREECAD_USE_PCH) + target_include_directories( MeasureGui PRIVATE diff --git a/src/Mod/Measure/Gui/Command.cpp b/src/Mod/Measure/Gui/Command.cpp index 3cf5860b31..1cb8dd019f 100644 --- a/src/Mod/Measure/Gui/Command.cpp +++ b/src/Mod/Measure/Gui/Command.cpp @@ -19,10 +19,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include #include diff --git a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp index 196b4d44e4..232a08c678 100644 --- a/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp +++ b/src/Mod/Measure/Gui/DlgPrefsMeasureAppearanceImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "DlgPrefsMeasureAppearanceImp.h" #include "ui_DlgPrefsMeasureAppearanceImp.h" diff --git a/src/Mod/Measure/Gui/PreCompiled.cpp b/src/Mod/Measure/Gui/PreCompiled.cpp deleted file mode 100644 index 78c1dbe181..0000000000 --- a/src/Mod/Measure/Gui/PreCompiled.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2023 David Friedli * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - **************************************************************************/ - -#include "PreCompiled.h" diff --git a/src/Mod/Measure/Gui/PreCompiled.h b/src/Mod/Measure/Gui/PreCompiled.h index ea0800dd42..b63b089ad6 100644 --- a/src/Mod/Measure/Gui/PreCompiled.h +++ b/src/Mod/Measure/Gui/PreCompiled.h @@ -30,8 +30,6 @@ #include #endif -#ifdef _PreComp_ - // standard #include @@ -75,6 +73,4 @@ // Inventor includes OpenGL #include -#endif //_PreComp_ - #endif diff --git a/src/Mod/Measure/Gui/QuickMeasure.cpp b/src/Mod/Measure/Gui/QuickMeasure.cpp index dc521da1a4..a12fff8703 100644 --- a/src/Mod/Measure/Gui/QuickMeasure.cpp +++ b/src/Mod/Measure/Gui/QuickMeasure.cpp @@ -20,13 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif + #include #include diff --git a/src/Mod/Measure/Gui/QuickMeasurePyImp.cpp b/src/Mod/Measure/Gui/QuickMeasurePyImp.cpp index df1eef886c..0b3f199df5 100644 --- a/src/Mod/Measure/Gui/QuickMeasurePyImp.cpp +++ b/src/Mod/Measure/Gui/QuickMeasurePyImp.cpp @@ -20,10 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include #include diff --git a/src/Mod/Measure/Gui/TaskMeasure.cpp b/src/Mod/Measure/Gui/TaskMeasure.cpp index 53fe55f515..6f8a3ffa54 100644 --- a/src/Mod/Measure/Gui/TaskMeasure.cpp +++ b/src/Mod/Measure/Gui/TaskMeasure.cpp @@ -20,12 +20,8 @@ **************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif #include "TaskMeasure.h" diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp index aa2aeb01fb..76137fca45 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp +++ b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp @@ -20,9 +20,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -51,7 +49,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureBase.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureBase.cpp index 45e60e815c..1eaf918c1d 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureBase.cpp +++ b/src/Mod/Measure/Gui/ViewProviderMeasureBase.cpp @@ -21,9 +21,7 @@ #include "Gui/Application.h" #include "Gui/MDIView.h" -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -38,7 +36,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureDistance.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureDistance.cpp index a53d528b7b..22f0fe0fc4 100644 --- a/src/Mod/Measure/Gui/ViewProviderMeasureDistance.cpp +++ b/src/Mod/Measure/Gui/ViewProviderMeasureDistance.cpp @@ -21,9 +21,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -47,7 +45,7 @@ #include #include #include -#endif + #include