From eb6e9f536553fcd50809ffd561ca48a5f5ec14e0 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 10 Dec 2022 05:49:18 +0100 Subject: [PATCH] [Inspection] enable precompiled headers --- src/Mod/Inspection/App/CMakeLists.txt | 7 ++++- src/Mod/Inspection/App/PreCompiled.cpp | 1 - src/Mod/Inspection/App/PreCompiled.h | 31 ++++++------------- src/Mod/Inspection/Gui/CMakeLists.txt | 6 ++++ src/Mod/Inspection/Gui/Command.cpp | 1 - src/Mod/Inspection/Gui/PreCompiled.cpp | 1 - src/Mod/Inspection/Gui/PreCompiled.h | 43 +++++++------------------- 7 files changed, 32 insertions(+), 58 deletions(-) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index 78cbb20f5f..9790087a51 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -36,10 +36,15 @@ set(Inspection_Scripts ../Init.py ) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Inspection_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(Inspection PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + add_library(Inspection SHARED ${Inspection_SRCS} ${Inspection_Scripts}) target_link_libraries(Inspection ${Inspection_LIBS}) - fc_target_copy_resource_flat(Inspection ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Inspection diff --git a/src/Mod/Inspection/App/PreCompiled.cpp b/src/Mod/Inspection/App/PreCompiled.cpp index c74d61cf64..41bf7beded 100644 --- a/src/Mod/Inspection/App/PreCompiled.cpp +++ b/src/Mod/Inspection/App/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Inspection/App/PreCompiled.h b/src/Mod/Inspection/App/PreCompiled.h index 2e8550c6e6..7b2059b4e3 100644 --- a/src/Mod/Inspection/App/PreCompiled.h +++ b/src/Mod/Inspection/App/PreCompiled.h @@ -19,51 +19,38 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ - - + #ifndef APP_PRECOMPILED_H #define APP_PRECOMPILED_H #include #ifdef _MSC_VER -# pragma warning(disable : 4290) -# pragma warning(disable : 4275) +# pragma warning(disable : 4005) +# pragma warning(disable : 4251) +# pragma warning(disable : 4503) +# pragma warning(disable : 4786)// specifier longer then 255 chars #endif #ifdef _PreComp_ -// standard -#include -#include -#include +// STL #include -// STL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - // OCC -#include #include #include #include #include +#include +#include #include // Qt -#include #include #include #include +#include #endif //_PreComp_ diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index ba50d91854..b8270eab39 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -45,6 +45,12 @@ set(InspectionGui_Scripts ../InitGui.py ) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${InspectionGui_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(InspectionGui PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + SET(InspectionGuiIcon_SVG Resources/icons/InspectionWorkbench.svg ) diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp index 609b294a92..4767190cf5 100644 --- a/src/Mod/Inspection/Gui/Command.cpp +++ b/src/Mod/Inspection/Gui/Command.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif diff --git a/src/Mod/Inspection/Gui/PreCompiled.cpp b/src/Mod/Inspection/Gui/PreCompiled.cpp index c74d61cf64..41bf7beded 100644 --- a/src/Mod/Inspection/Gui/PreCompiled.cpp +++ b/src/Mod/Inspection/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h index f80b346f42..6751f3a7c2 100644 --- a/src/Mod/Inspection/Gui/PreCompiled.h +++ b/src/Mod/Inspection/Gui/PreCompiled.h @@ -20,67 +20,46 @@ * * ***************************************************************************/ - #ifndef GUI_PRECOMPILED_H #define GUI_PRECOMPILED_H #include -#ifdef FC_OS_WIN32 -# ifndef NOMINMAX -# define NOMINMAX -# endif -#endif - #ifdef _MSC_VER -# pragma warning(disable : 4005) +# pragma warning(disable : 4005) +# pragma warning(disable : 4251) +# pragma warning(disable : 4503) +# pragma warning(disable : 4786)// specifier longer then 255 chars #endif #ifdef _PreComp_ -// standard -#include -#include - // STL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef FC_OS_WIN32 -# include -#endif +#include // Inventor #include #include #include #include +#include #include #include #include -#include #include #include #include +#include #include #include #include #include #include -#include -// Qt Toolkit -#ifndef __QtAll__ -# include -#endif +// Qt +#include +#include +#include #endif //_PreComp_