From def72857b85897963ddacafca049d986d383c95c Mon Sep 17 00:00:00 2001 From: Uwe Date: Thu, 8 Dec 2022 02:10:46 +0100 Subject: [PATCH] [Spread] App: enable precompiled headers --- src/Mod/Spreadsheet/App/CMakeLists.txt | 10 ++++++++-- src/Mod/Spreadsheet/App/PreCompiled.h | 14 +++++++++----- src/Mod/Spreadsheet/App/PropertySheet.cpp | 3 ++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt index 40b116ba8f..959ce57bd0 100644 --- a/src/Mod/Spreadsheet/App/CMakeLists.txt +++ b/src/Mod/Spreadsheet/App/CMakeLists.txt @@ -19,6 +19,8 @@ set(Spreadsheet_SRCS Cell.cpp Cell.h DisplayUnit.h + PreCompiled.cpp + PreCompiled.h PropertySheet.cpp PropertySheet.h PropertySheetPy.xml @@ -31,8 +33,6 @@ set(Spreadsheet_SRCS PropertyRowHeights.h PropertyRowHeightsPy.xml PropertyRowHeightsPyImp.cpp - PreCompiled.cpp - PreCompiled.h Sheet.cpp Sheet.h SheetPy.xml @@ -49,6 +49,12 @@ generate_from_xml(PropertySheetPy) generate_from_xml(PropertyColumnWidthsPy) generate_from_xml(PropertyRowHeightsPy) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Spreadsheet_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(Spreadsheet PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + add_library(Spreadsheet SHARED ${Spreadsheet_SRCS}) target_link_libraries(Spreadsheet ${Spreadsheet_LIBS}) diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h index d253a5c8cb..779a2ea42f 100644 --- a/src/Mod/Spreadsheet/App/PreCompiled.h +++ b/src/Mod/Spreadsheet/App/PreCompiled.h @@ -37,6 +37,7 @@ #ifdef _PreComp_ // STL +#include #include #include #include @@ -51,13 +52,16 @@ #include #include -#ifdef FC_OS_WIN32 -# include -#endif - // Qt #include -#endif //_PreComp_ +#elif defined(FC_OS_WIN32) +#define WIN32_LEAN_AND_MEAN +#ifndef NOMINMAX +# define NOMINMAX +#endif +#include +#include +#endif//_PreComp_ #endif // SPREADSHEET_PRECOMPILED_H diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp index 6182619095..813c1c1219 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.cpp +++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp @@ -21,8 +21,9 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ +# include + # include # include # include