mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0028417: Using PRECOMPILED HEADER to speed up compilation time
Use of Cotire tool is introduced for acceleration of CMake builds, by usage of precompiled headers. CMake option BUILD_USE_PCH is added to enable / disable use of precompiled headers When precompiled headers are used, additional compiler macros are defined globally in the build system to avoid problems due to different order of included files: - NOMINMAX is defined on Windows to prevent defining "min" and "max" as macros by windows.h - STRSAFE_NO_DEPRECATE and _SCL_SECURE_NO_WARNINGS are defined on Windows to prevent declaring functions of standard C library as deprecated by #pragma, and other warnings in system headers - GL_GLEXT_LEGACY and GLX_GLEXT_LEGACY are defined to ensure that only OCCT's own glext.h is used - __STDC_FORMAT_MACROS is defined to have standard C print format macros always defined Code is corrected to avoid conflicts with system headers and in case of compiling together as unity builds (partially): - Some locally defined variables in TKV3d, TKHLR are renamed to be unique - Duplicated definitions of macros and global functions are eliminated in TKSTEP - Useless header WNT_UInt.hxx is removed - Usage of local variables conflicting with X11 macro is avoided in Draw_Viewer.cxx - Local variables in AIS_ConcentricRelation.cxx are renamed to avoid conflict with macros defined in windows.h - HXX files containing code are renamed to PXX or merged with corresponding CXX files. IVtkTools classes are corrected to avoid compiler warnings disabled in non-PCH builds by inclusion of VTK headers. Useless pragmas disabling warnings on MSVC are removed
This commit is contained in:
@@ -111,7 +111,6 @@ void OSD_Chronometer::GetThreadCPU (Standard_Real& theUserSeconds,
|
||||
|
||||
//---------------------------- Systeme WNT --------------------------------
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
||||
//=======================================================================
|
||||
|
@@ -185,7 +185,6 @@ Standard_Integer OSD_DirectoryIterator::Error()const{
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
||||
|
||||
|
@@ -155,9 +155,6 @@ Standard_Integer OSD_Disk::Error()const{
|
||||
//---------------------------- Windows NT System --------------------------------
|
||||
//-------------------------------------------------------------------------------
|
||||
|
||||
#define STRICT
|
||||
|
||||
|
||||
#include <OSD_Disk.hxx>
|
||||
#include <OSD_OSDError.hxx>
|
||||
#include <OSD_Path.hxx>
|
||||
|
@@ -232,7 +232,6 @@ Standard_Integer OSD_Environment::Error() const
|
||||
//------------------- WNT Sources of OSD_Environment --------------------
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
||||
#include <OSD_Environment.hxx>
|
||||
|
@@ -443,7 +443,6 @@ void OSD_Error::Perror() {
|
||||
//------------------- Windows NT sources for OSD_Error ------------------
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#define STRICT
|
||||
#include <OSD_Error.hxx>
|
||||
#include <OSD_ErrorList.hxx>
|
||||
#include <TCollection_ExtendedString.hxx>
|
||||
|
@@ -263,7 +263,6 @@ Standard_Integer OSD_FileIterator::Error()const{
|
||||
//------------------- Windows NT sources for OSD_FileIterator -----------
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
||||
|
||||
|
@@ -362,7 +362,6 @@ Standard_Integer OSD_FileNode::Error()const{
|
||||
//------------------- WNT Sources of OSD_FileNode ---------------------------
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
#define STRICT
|
||||
#ifdef NONLS
|
||||
#undef NONLS
|
||||
#endif
|
||||
|
@@ -181,7 +181,6 @@ Standard_Integer OSD_Host::Error()const{
|
||||
//------------------- WNT Sources of OSD_Host ---------------------------
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
||||
#include <OSD_Host.hxx>
|
||||
|
@@ -44,7 +44,6 @@ static inline Standard_Real GetWallClockTime ()
|
||||
#else
|
||||
//------------------- Windows NT ------------------
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
||||
//=======================================================================
|
||||
|
@@ -20,7 +20,6 @@
|
||||
#ifdef _WIN32
|
||||
//---------------------------- Windows NT System --------------------------------
|
||||
|
||||
#define STRICT
|
||||
#ifdef NOUSER
|
||||
#undef NOUSER
|
||||
#endif
|
||||
@@ -615,7 +614,8 @@ LONG _osd_debug ( void ) {
|
||||
#include <pthread.h>
|
||||
|
||||
#ifdef __linux__
|
||||
#include <fenv.h>
|
||||
#include <cfenv>
|
||||
//#include <fenv.h>
|
||||
static Standard_Boolean fFltExceptions = Standard_False;
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user