From f0eca551b3d8cbc8434a599e5ecbf28ea9fe4346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Reitb=C3=B6ck?= Date: Sat, 13 Sep 2025 11:26:01 +0200 Subject: [PATCH] Base: 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/Base/Axis.cpp | 2 -- src/Base/AxisPyImp.cpp | 2 -- src/Base/Base64.cpp | 3 --- src/Base/BaseClass.cpp | 5 ----- src/Base/BaseClassPyImp.cpp | 2 -- src/Base/BindingManager.cpp | 4 ---- src/Base/BoundBoxPyImp.cpp | 2 -- src/Base/Builder3D.cpp | 4 ---- src/Base/CMakeLists.txt | 6 +++--- src/Base/Color.cpp | 5 ----- src/Base/Console.cpp | 4 +--- src/Base/ConsoleObserver.cpp | 4 +--- src/Base/CoordinateSystem.cpp | 2 -- src/Base/CoordinateSystemPyImp.cpp | 1 - src/Base/Debugger.cpp | 4 ---- src/Base/DualQuaternion.cpp | 2 -- src/Base/Exception.cpp | 5 ++--- src/Base/Exception.h | 2 ++ src/Base/ExceptionFactory.cpp | 1 - src/Base/Factory.cpp | 5 ----- src/Base/FileInfo.cpp | 4 +--- src/Base/FutureWatcherProgress.cpp | 2 -- src/Base/GeometryPyCXX.cpp | 4 ---- src/Base/Handle.cpp | 5 ----- src/Base/InputSource.cpp | 3 --- src/Base/Interpreter.cpp | 7 ++----- src/Base/Interpreter.h | 2 ++ src/Base/Matrix.cpp | 3 --- src/Base/MatrixPyImp.cpp | 3 --- src/Base/Observer.cpp | 2 -- src/Base/Parameter.cpp | 6 ++---- src/Base/Parameter.h | 2 ++ src/Base/ParameterPy.cpp | 5 +---- src/Base/Persistence.cpp | 5 ----- src/Base/PersistencePyImp.cpp | 2 -- src/Base/Placement.cpp | 2 -- src/Base/PlacementPyImp.cpp | 2 -- src/Base/PreCompiled.cpp | 23 ----------------------- src/Base/PreCompiled.h | 5 ----- src/Base/PrecisionPyImp.cpp | 1 - src/Base/ProgressIndicator.cpp | 2 -- src/Base/ProgressIndicatorPy.cpp | 3 --- src/Base/PyExport.cpp | 2 -- src/Base/PyExport.h | 3 +++ src/Base/PyObjectBase.cpp | 5 ----- src/Base/PythonTypeExt.cpp | 1 - src/Base/Quantity.cpp | 3 --- src/Base/QuantityPyImp.cpp | 3 --- src/Base/Reader.cpp | 5 ----- src/Base/Rotation.cpp | 5 ----- src/Base/RotationPyImp.cpp | 2 -- src/Base/Sequencer.cpp | 5 ----- src/Base/ServiceProvider.cpp | 1 - src/Base/SmartPtrPy.cpp | 4 ---- src/Base/StackWalker.cpp | 1 - src/Base/Stream.cpp | 5 ----- src/Base/Swap.cpp | 3 --- src/Base/Tools.cpp | 4 ---- src/Base/Tools2D.cpp | 5 ----- src/Base/Tools3D.cpp | 3 --- src/Base/Translate.cpp | 1 - src/Base/Type.cpp | 4 ---- src/Base/TypePyImp.cpp | 2 -- src/Base/UniqueNameManager.cpp | 5 +---- src/Base/Unit.cpp | 3 --- src/Base/UnitPyImp.cpp | 3 --- src/Base/UnitsApi.cpp | 3 --- src/Base/UnitsApiPy.cpp | 3 --- src/Base/UnitsSchema.cpp | 2 -- src/Base/Uuid.cpp | 4 ---- src/Base/Vector3D.cpp | 9 ++------- src/Base/VectorPyImp.cpp | 3 --- src/Base/ViewProj.cpp | 1 - src/Base/Writer.cpp | 3 --- src/Base/XMLTools.cpp | 5 ----- src/Base/ZipHeader.cpp | 2 -- src/Base/swigpyrun.cpp | 1 - tests/src/Base/Reader.cpp | 3 ++- 78 files changed, 27 insertions(+), 248 deletions(-) delete mode 100644 src/Base/PreCompiled.cpp diff --git a/src/Base/Axis.cpp b/src/Base/Axis.cpp index 3b0dad5edd..a1fc07c336 100644 --- a/src/Base/Axis.cpp +++ b/src/Base/Axis.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Axis.h" #include "Placement.h" diff --git a/src/Base/AxisPyImp.cpp b/src/Base/AxisPyImp.cpp index bd0bbb39ff..92b81e5edf 100644 --- a/src/Base/AxisPyImp.cpp +++ b/src/Base/AxisPyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "GeometryPyCXX.h" // generated out of Axis.pyi diff --git a/src/Base/Base64.cpp b/src/Base/Base64.cpp index ba4c4dfb04..0b456df229 100644 --- a/src/Base/Base64.cpp +++ b/src/Base/Base64.cpp @@ -28,11 +28,8 @@ rather than returning a new string for each call. These modifications are Copyright (c) 2019 Zheng Lei (realthunder.dev@gmail.com) */ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include "Base64.h" diff --git a/src/Base/BaseClass.cpp b/src/Base/BaseClass.cpp index 16c0ee8341..c031ee37ac 100644 --- a/src/Base/BaseClass.cpp +++ b/src/Base/BaseClass.cpp @@ -20,12 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include "BaseClass.h" #include "PyObjectBase.h" diff --git a/src/Base/BaseClassPyImp.cpp b/src/Base/BaseClassPyImp.cpp index 31b0f48f84..22f6bf96d0 100644 --- a/src/Base/BaseClassPyImp.cpp +++ b/src/Base/BaseClassPyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Type.h" // generated out of BaseClass.pyi diff --git a/src/Base/BindingManager.cpp b/src/Base/BindingManager.cpp index 5bac684214..bbb6764b20 100644 --- a/src/Base/BindingManager.cpp +++ b/src/Base/BindingManager.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include "BindingManager.h" diff --git a/src/Base/BoundBoxPyImp.cpp b/src/Base/BoundBoxPyImp.cpp index af877268b7..64c7b01dd3 100644 --- a/src/Base/BoundBoxPyImp.cpp +++ b/src/Base/BoundBoxPyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "GeometryPyCXX.h" // generated out of BoundBox.pyi diff --git a/src/Base/Builder3D.cpp b/src/Base/Builder3D.cpp index 2ab928cc1c..7bb7dc006d 100644 --- a/src/Base/Builder3D.cpp +++ b/src/Base/Builder3D.cpp @@ -21,9 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -31,7 +28,6 @@ #include #include #include -#endif #include "Builder3D.h" #include "Console.h" diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 0aaaa97488..9d3c9b32ed 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -314,7 +314,6 @@ SET(FreeCADBase_SRCS ${FreeCADBase_UNITAPI_SRCS} PyTools.c PyTools.h - PreCompiled.cpp PreCompiled.h ) @@ -334,8 +333,9 @@ else() endif() if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - ADD_MSVC_PRECOMPILED_HEADER(FreeCADBase PreCompiled.h PreCompiled.cpp FreeCADBase_CPP_SRCS) + target_precompile_headers(FreeCADBase PRIVATE + $<$:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h"> + ) endif(FREECAD_USE_PCH) target_sources(FreeCADBase PRIVATE ${FreeCADBase_SRCS}) diff --git a/src/Base/Color.cpp b/src/Base/Color.cpp index 0d63b76339..f97c6181d1 100644 --- a/src/Base/Color.cpp +++ b/src/Base/Color.cpp @@ -20,13 +20,8 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif #include "Color.h" diff --git a/src/Base/Console.cpp b/src/Base/Console.cpp index b8cfd89561..0c7e9ce4f7 100644 --- a/src/Base/Console.cpp +++ b/src/Base/Console.cpp @@ -21,9 +21,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ #if defined(FC_OS_WIN32) #include #elif defined(FC_OS_LINUX) || defined(FC_OS_MACOSX) @@ -31,7 +30,6 @@ #endif #include #include -#endif #include "Console.h" #include "PyObjectBase.h" diff --git a/src/Base/ConsoleObserver.cpp b/src/Base/ConsoleObserver.cpp index 4b50fc70fb..8840c4c69a 100644 --- a/src/Base/ConsoleObserver.cpp +++ b/src/Base/ConsoleObserver.cpp @@ -21,15 +21,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ #ifdef FC_OS_WIN32 #include #endif #include #include -#endif #include diff --git a/src/Base/CoordinateSystem.cpp b/src/Base/CoordinateSystem.cpp index 0ace367610..a32fcf9aa7 100644 --- a/src/Base/CoordinateSystem.cpp +++ b/src/Base/CoordinateSystem.cpp @@ -21,8 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" - #include "CoordinateSystem.h" #include "Exception.h" #include "Matrix.h" diff --git a/src/Base/CoordinateSystemPyImp.cpp b/src/Base/CoordinateSystemPyImp.cpp index fb6e4469b6..7b809072ad 100644 --- a/src/Base/CoordinateSystemPyImp.cpp +++ b/src/Base/CoordinateSystemPyImp.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "GeometryPyCXX.h" diff --git a/src/Base/Debugger.cpp b/src/Base/Debugger.cpp index 99c1573d48..7cf590f2af 100644 --- a/src/Base/Debugger.cpp +++ b/src/Base/Debugger.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include "Debugger.h" #include "Console.h" diff --git a/src/Base/DualQuaternion.cpp b/src/Base/DualQuaternion.cpp index e1b611e882..5513e1529d 100644 --- a/src/Base/DualQuaternion.cpp +++ b/src/Base/DualQuaternion.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include #include "DualQuaternion.h" diff --git a/src/Base/Exception.cpp b/src/Base/Exception.cpp index aba6e95ee6..14f76e0343 100644 --- a/src/Base/Exception.cpp +++ b/src/Base/Exception.cpp @@ -21,10 +21,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + +#include #include "Console.h" #include "PyObjectBase.h" diff --git a/src/Base/Exception.h b/src/Base/Exception.h index b85a3592c1..227da44989 100644 --- a/src/Base/Exception.h +++ b/src/Base/Exception.h @@ -24,6 +24,8 @@ #ifndef BASE_EXCEPTION_H #define BASE_EXCEPTION_H +#include + #include #include #include diff --git a/src/Base/ExceptionFactory.cpp b/src/Base/ExceptionFactory.cpp index ae0b1801c5..7d75507746 100644 --- a/src/Base/ExceptionFactory.cpp +++ b/src/Base/ExceptionFactory.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "ExceptionFactory.h" #include diff --git a/src/Base/Factory.cpp b/src/Base/Factory.cpp index 35717b1110..05f07a331b 100644 --- a/src/Base/Factory.cpp +++ b/src/Base/Factory.cpp @@ -21,12 +21,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include "Factory.h" #include "Console.h" diff --git a/src/Base/FileInfo.cpp b/src/Base/FileInfo.cpp index f5370bfeb1..f1b701576f 100644 --- a/src/Base/FileInfo.cpp +++ b/src/Base/FileInfo.cpp @@ -21,9 +21,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ #include #include #include @@ -34,7 +33,6 @@ #else #include #endif -#endif #include "FileInfo.h" #include "Exception.h" diff --git a/src/Base/FutureWatcherProgress.cpp b/src/Base/FutureWatcherProgress.cpp index 8ffbfdcadd..5d5eb66ae8 100644 --- a/src/Base/FutureWatcherProgress.cpp +++ b/src/Base/FutureWatcherProgress.cpp @@ -21,8 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" - #include "FutureWatcherProgress.h" using namespace Base; diff --git a/src/Base/GeometryPyCXX.cpp b/src/Base/GeometryPyCXX.cpp index dc96d98314..aa9eafc7bc 100644 --- a/src/Base/GeometryPyCXX.cpp +++ b/src/Base/GeometryPyCXX.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include "GeometryPyCXX.h" #include "VectorPy.h" diff --git a/src/Base/Handle.cpp b/src/Base/Handle.cpp index 9a8e7589f0..d8d5d633d4 100644 --- a/src/Base/Handle.cpp +++ b/src/Base/Handle.cpp @@ -21,13 +21,8 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif #include diff --git a/src/Base/InputSource.cpp b/src/Base/InputSource.cpp index 903dcc2121..bc49aa3975 100644 --- a/src/Base/InputSource.cpp +++ b/src/Base/InputSource.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - #include #include diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp index e44509455c..ee6763108f 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp @@ -21,13 +21,10 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif + +#include #include "Interpreter.h" #include "Console.h" diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h index 6ca8874829..32da1ecdc1 100644 --- a/src/Base/Interpreter.h +++ b/src/Base/Interpreter.h @@ -31,6 +31,8 @@ #undef _XOPEN_SOURCE #endif // (re-)defined in pyconfig.h +#include + #ifdef FC_OS_MACOSX #undef toupper #undef tolower diff --git a/src/Base/Matrix.cpp b/src/Base/Matrix.cpp index 8a9f5019c0..6cbf47721d 100644 --- a/src/Base/Matrix.cpp +++ b/src/Base/Matrix.cpp @@ -21,11 +21,8 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include "Matrix.h" #include "Converter.h" diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp index 07812c3bc0..57d66b108a 100644 --- a/src/Base/MatrixPyImp.cpp +++ b/src/Base/MatrixPyImp.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include "GeometryPyCXX.h" diff --git a/src/Base/Observer.cpp b/src/Base/Observer.cpp index b40317e616..d42d1a41f5 100644 --- a/src/Base/Observer.cpp +++ b/src/Base/Observer.cpp @@ -21,8 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Observer.h" diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index ef5e17e664..b19d8d51b2 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -22,9 +22,6 @@ ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -40,12 +37,13 @@ #include #include #include -#endif #include #include #include +#include + #ifdef FC_OS_LINUX #include #endif diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h index d025274679..e154dec280 100644 --- a/src/Base/Parameter.h +++ b/src/Base/Parameter.h @@ -35,6 +35,8 @@ // Python stuff using PyObject = struct _object; +#include + #ifdef FC_OS_MACOSX #undef toupper #undef tolower diff --git a/src/Base/ParameterPy.cpp b/src/Base/ParameterPy.cpp index 2f000d80bd..be66c0f370 100644 --- a/src/Base/ParameterPy.cpp +++ b/src/Base/ParameterPy.cpp @@ -21,10 +21,8 @@ * * ***************************************************************************/ +#include -#include "PreCompiled.h" - -#ifndef _PreComp_ #ifdef FC_OS_WIN32 #include #endif @@ -32,7 +30,6 @@ #include #include #include -#endif #ifdef FC_OS_LINUX #include diff --git a/src/Base/Persistence.cpp b/src/Base/Persistence.cpp index 8a90f858c7..f7508e34d1 100644 --- a/src/Base/Persistence.cpp +++ b/src/Base/Persistence.cpp @@ -20,16 +20,11 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include #include #include -#endif #include diff --git a/src/Base/PersistencePyImp.cpp b/src/Base/PersistencePyImp.cpp index 59a7834dec..5eddad729f 100644 --- a/src/Base/PersistencePyImp.cpp +++ b/src/Base/PersistencePyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include #include "Persistence.h" diff --git a/src/Base/Placement.cpp b/src/Base/Placement.cpp index e9b66932e1..6d1a612eec 100644 --- a/src/Base/Placement.cpp +++ b/src/Base/Placement.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include #include "Placement.h" diff --git a/src/Base/PlacementPyImp.cpp b/src/Base/PlacementPyImp.cpp index a60a464ba2..4190a630e7 100644 --- a/src/Base/PlacementPyImp.cpp +++ b/src/Base/PlacementPyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "GeometryPyCXX.h" #include "Matrix.h" #include "PyWrapParseTupleAndKeywords.h" diff --git a/src/Base/PreCompiled.cpp b/src/Base/PreCompiled.cpp deleted file mode 100644 index 820dcebfee..0000000000 --- a/src/Base/PreCompiled.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2002 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/Base/PreCompiled.h b/src/Base/PreCompiled.h index 1b5965612f..7841982d13 100644 --- a/src/Base/PreCompiled.h +++ b/src/Base/PreCompiled.h @@ -26,8 +26,6 @@ #include -#ifdef _PreComp_ - // Python #include @@ -136,7 +134,4 @@ #include #include - -#endif //_PreComp_ - #endif // BASE_PRECOMPILED_H diff --git a/src/Base/PrecisionPyImp.cpp b/src/Base/PrecisionPyImp.cpp index 0124d5ce70..b055673931 100644 --- a/src/Base/PrecisionPyImp.cpp +++ b/src/Base/PrecisionPyImp.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" // generated out of Precision.pyi #include "PrecisionPy.h" diff --git a/src/Base/ProgressIndicator.cpp b/src/Base/ProgressIndicator.cpp index 0be5fd0258..300caa21e3 100644 --- a/src/Base/ProgressIndicator.cpp +++ b/src/Base/ProgressIndicator.cpp @@ -20,8 +20,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include "ProgressIndicator.h" namespace Base diff --git a/src/Base/ProgressIndicatorPy.cpp b/src/Base/ProgressIndicatorPy.cpp index f4e4b04837..bfece4c34f 100644 --- a/src/Base/ProgressIndicatorPy.cpp +++ b/src/Base/ProgressIndicatorPy.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - #include "Exception.h" #include "ProgressIndicatorPy.h" diff --git a/src/Base/PyExport.cpp b/src/Base/PyExport.cpp index 467a91fa43..da5b8d0038 100644 --- a/src/Base/PyExport.cpp +++ b/src/Base/PyExport.cpp @@ -28,8 +28,6 @@ * \date $Date: 2006/01/24 14:26:42 $ */ -#include "PreCompiled.h" - #include "PyExport.h" diff --git a/src/Base/PyExport.h b/src/Base/PyExport.h index 6c9e994752..3723a32fe8 100644 --- a/src/Base/PyExport.h +++ b/src/Base/PyExport.h @@ -40,6 +40,9 @@ #endif #include + +#include + #ifdef FC_OS_MACOSX #undef toupper #undef tolower diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp index daf17e75a8..e8d8a6f49a 100644 --- a/src/Base/PyObjectBase.cpp +++ b/src/Base/PyObjectBase.cpp @@ -20,12 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include "PyObjectBase.h" #include "Console.h" diff --git a/src/Base/PythonTypeExt.cpp b/src/Base/PythonTypeExt.cpp index d48d646d82..ef939a11e2 100644 --- a/src/Base/PythonTypeExt.cpp +++ b/src/Base/PythonTypeExt.cpp @@ -22,7 +22,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index edd268fa51..5ab323cd90 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -20,15 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp index dc7b177b51..9b986a52b3 100644 --- a/src/Base/QuantityPyImp.cpp +++ b/src/Base/QuantityPyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -29,7 +27,6 @@ #include #include #include -#endif #include "Unit.h" diff --git a/src/Base/Reader.cpp b/src/Base/Reader.cpp index 1d2ecef50b..687ffb5db6 100644 --- a/src/Base/Reader.cpp +++ b/src/Base/Reader.cpp @@ -20,17 +20,12 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include diff --git a/src/Base/Rotation.cpp b/src/Base/Rotation.cpp index f77d91c34d..3942d6753e 100644 --- a/src/Base/Rotation.cpp +++ b/src/Base/Rotation.cpp @@ -20,12 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include #include "Base/Exception.h" diff --git a/src/Base/RotationPyImp.cpp b/src/Base/RotationPyImp.cpp index 3cefd052e0..0c129703ab 100644 --- a/src/Base/RotationPyImp.cpp +++ b/src/Base/RotationPyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "GeometryPyCXX.h" #include "PyWrapParseTupleAndKeywords.h" #include "Tools.h" diff --git a/src/Base/Sequencer.cpp b/src/Base/Sequencer.cpp index 82ae8c57f2..be0a3bbd18 100644 --- a/src/Base/Sequencer.cpp +++ b/src/Base/Sequencer.cpp @@ -20,15 +20,10 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include #include -#endif #include "Sequencer.h" diff --git a/src/Base/ServiceProvider.cpp b/src/Base/ServiceProvider.cpp index 7401c3e9cf..836f58948a 100644 --- a/src/Base/ServiceProvider.cpp +++ b/src/Base/ServiceProvider.cpp @@ -22,7 +22,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "ServiceProvider.h" diff --git a/src/Base/SmartPtrPy.cpp b/src/Base/SmartPtrPy.cpp index cd9757c929..1b4a6cb8c6 100644 --- a/src/Base/SmartPtrPy.cpp +++ b/src/Base/SmartPtrPy.cpp @@ -21,10 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "SmartPtrPy.h" #include "Interpreter.h" #include diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index e8a44c80a3..9634e21d1a 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -84,7 +84,6 @@ * **********************************************************************/ -#include #include "StackWalker.h" #include diff --git a/src/Base/Stream.cpp b/src/Base/Stream.cpp index 85ecbc99b4..c13b7abfee 100644 --- a/src/Base/Stream.cpp +++ b/src/Base/Stream.cpp @@ -20,16 +20,11 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #ifdef __GNUC__ #include #endif -#endif #include "Stream.h" #include "Swap.h" diff --git a/src/Base/Swap.cpp b/src/Base/Swap.cpp index 41734b48b3..4b40737688 100644 --- a/src/Base/Swap.cpp +++ b/src/Base/Swap.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - #include "Swap.h" unsigned short Base::SwapOrder() diff --git a/src/Base/Tools.cpp b/src/Base/Tools.cpp index 7ddf08c094..c3412582e4 100644 --- a/src/Base/Tools.cpp +++ b/src/Base/Tools.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -30,7 +27,6 @@ #include #include #include -#endif #include "PyExport.h" #include "Interpreter.h" diff --git a/src/Base/Tools2D.cpp b/src/Base/Tools2D.cpp index 9a70b0bc36..930361efaa 100644 --- a/src/Base/Tools2D.cpp +++ b/src/Base/Tools2D.cpp @@ -20,14 +20,9 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include -#endif #include "Tools2D.h" #include "Vector3D.h" diff --git a/src/Base/Tools3D.cpp b/src/Base/Tools3D.cpp index 605759e2c9..432b11925d 100644 --- a/src/Base/Tools3D.cpp +++ b/src/Base/Tools3D.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - #include "BoundBox.h" #include "Placement.h" #include "Tools3D.h" diff --git a/src/Base/Translate.cpp b/src/Base/Translate.cpp index de66aea3a2..19562c0243 100644 --- a/src/Base/Translate.cpp +++ b/src/Base/Translate.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "Translate.h" #include diff --git a/src/Base/Type.cpp b/src/Base/Type.cpp index 5197df66dc..e8f00009ef 100644 --- a/src/Base/Type.cpp +++ b/src/Base/Type.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include "Type.h" #include "Interpreter.h" diff --git a/src/Base/TypePyImp.cpp b/src/Base/TypePyImp.cpp index e4dbd24753..80128c05a2 100644 --- a/src/Base/TypePyImp.cpp +++ b/src/Base/TypePyImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Type.h" #include "BindingManager.h" diff --git a/src/Base/UniqueNameManager.cpp b/src/Base/UniqueNameManager.cpp index a7f580e0a7..45d50d5a97 100644 --- a/src/Base/UniqueNameManager.cpp +++ b/src/Base/UniqueNameManager.cpp @@ -19,15 +19,12 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include -#endif + #include "UniqueNameManager.h" std::tuple diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp index 45a4af42e7..45e224137d 100644 --- a/src/Base/Unit.cpp +++ b/src/Base/Unit.cpp @@ -19,8 +19,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -28,7 +26,6 @@ #include #include #include -#endif #include #include diff --git a/src/Base/UnitPyImp.cpp b/src/Base/UnitPyImp.cpp index 35edc8450e..6cc4e9bcaf 100644 --- a/src/Base/UnitPyImp.cpp +++ b/src/Base/UnitPyImp.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include "Unit.h" diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp index a58790e8a2..c539c73c1f 100644 --- a/src/Base/UnitsApi.cpp +++ b/src/Base/UnitsApi.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include diff --git a/src/Base/UnitsApiPy.cpp b/src/Base/UnitsApiPy.cpp index f6f8819892..f550e1b4c3 100644 --- a/src/Base/UnitsApiPy.cpp +++ b/src/Base/UnitsApiPy.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include diff --git a/src/Base/UnitsSchema.cpp b/src/Base/UnitsSchema.cpp index 871ab828b7..f1a2bba0de 100644 --- a/src/Base/UnitsSchema.cpp +++ b/src/Base/UnitsSchema.cpp @@ -19,8 +19,6 @@ * * ************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Base/Uuid.cpp b/src/Base/Uuid.cpp index 695d7a6d8f..5c22e93a72 100644 --- a/src/Base/Uuid.cpp +++ b/src/Base/Uuid.cpp @@ -21,11 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include diff --git a/src/Base/Vector3D.cpp b/src/Base/Vector3D.cpp index 7cc67b02c6..d1ae3c90e4 100644 --- a/src/Base/Vector3D.cpp +++ b/src/Base/Vector3D.cpp @@ -20,14 +20,9 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ -#include -#endif - #include +#include + #include #include "Vector3D.h" diff --git a/src/Base/VectorPyImp.cpp b/src/Base/VectorPyImp.cpp index da2104bfe0..1ff7f16083 100644 --- a/src/Base/VectorPyImp.cpp +++ b/src/Base/VectorPyImp.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include "GeometryPyCXX.h" #include "Vector3D.h" diff --git a/src/Base/ViewProj.cpp b/src/Base/ViewProj.cpp index c679e9a46c..93d1c3ab79 100644 --- a/src/Base/ViewProj.cpp +++ b/src/Base/ViewProj.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" #include "ViewProj.h" using namespace Base; diff --git a/src/Base/Writer.cpp b/src/Base/Writer.cpp index beb58c530f..90a66a4128 100644 --- a/src/Base/Writer.cpp +++ b/src/Base/Writer.cpp @@ -21,13 +21,10 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include -#endif #include #include diff --git a/src/Base/XMLTools.cpp b/src/Base/XMLTools.cpp index 60ac09ae12..c98542498f 100644 --- a/src/Base/XMLTools.cpp +++ b/src/Base/XMLTools.cpp @@ -20,13 +20,8 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif #include "Exception.h" #include "XMLTools.h" diff --git a/src/Base/ZipHeader.cpp b/src/Base/ZipHeader.cpp index 41e46a6bf1..90a42b151b 100644 --- a/src/Base/ZipHeader.cpp +++ b/src/Base/ZipHeader.cpp @@ -21,8 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" - #include "ZipHeader.h" #include #include diff --git a/src/Base/swigpyrun.cpp b/src/Base/swigpyrun.cpp index 87fc3f59c5..85c958f919 100644 --- a/src/Base/swigpyrun.cpp +++ b/src/Base/swigpyrun.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" #include #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) #if defined(__clang__) diff --git a/tests/src/Base/Reader.cpp b/tests/src/Base/Reader.cpp index e4b925a939..b1a3e03802 100644 --- a/tests/src/Base/Reader.cpp +++ b/tests/src/Base/Reader.cpp @@ -2,6 +2,8 @@ #include +#include + #ifdef _MSC_VER #pragma warning(disable : 4996) #pragma warning(disable : 4305) @@ -16,7 +18,6 @@ #include #include #include -#include namespace fs = std::filesystem;