1
0
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:
abv
2017-06-29 20:17:39 +03:00
committed by bugmaster
parent a07cff6957
commit 896faa7296
91 changed files with 5213 additions and 1746 deletions

View File

@@ -24,7 +24,7 @@
IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyData,MMgt_TShared)
#ifdef OCCT_DEBUG
static Standard_Integer ERROR = Standard_False;
static Standard_Integer HLRAlgo_PolyData_ERROR = Standard_False;
#endif
//=======================================================================
//function : PolyData
@@ -381,7 +381,7 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
m[npi] = Multiple;
}
#ifdef OCCT_DEBUG
else if (ERROR) {
else if (HLRAlgo_PolyData_ERROR) {
cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
cout << " ( more than 2 points )." << endl;
}
@@ -523,7 +523,7 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
m[npi] = Multiple;
}
#ifdef OCCT_DEBUG
else if (ERROR) {
else if (HLRAlgo_PolyData_ERROR) {
cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
cout << " ( more than 2 points )." << endl;
}
@@ -665,7 +665,7 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
m[npi] = Multiple;
}
#ifdef OCCT_DEBUG
else if (ERROR) {
else if (HLRAlgo_PolyData_ERROR) {
cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
cout << " ( more than 2 points )." << endl;
}

View File

@@ -23,8 +23,8 @@
IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyInternalData,MMgt_TShared)
#ifdef OCCT_DEBUG
static Standard_Integer TRACE = Standard_False;
static Standard_Integer ERROR = Standard_False;
static Standard_Integer HLRAlgo_PolyInternalData_TRACE = Standard_False;
static Standard_Integer HLRAlgo_PolyInternalData_ERROR = Standard_False;
#endif
//=======================================================================
//function : PolyInternalData
@@ -325,7 +325,7 @@ HLRAlgo_PolyInternalData::AddNode (
else {
Nod3RValues.Normal = gp_XYZ(1., 0., 0.);
#ifdef OCCT_DEBUG
if (ERROR)
if (HLRAlgo_PolyInternalData_ERROR)
cout << "HLRAlgo_PolyInternalData::AddNode" << endl;
#endif
}
@@ -414,7 +414,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
if (find == 0) {
myNbPISeg--;
#ifdef OCCT_DEBUG
if (ERROR) {
if (HLRAlgo_PolyInternalData_ERROR) {
cout << "HLRAlgo_PolyInternalData::UpdateLinks : segment error";
cout << endl;
}
@@ -519,7 +519,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
aNodIndices4.NdSg = myNbPISeg;
}
#ifdef OCCT_DEBUG
else if (ERROR) {
else if (HLRAlgo_PolyInternalData_ERROR) {
cout << "HLRAlgo_PolyInternalData::UpdateLinks : triangle error ";
cout << endl;
}
@@ -680,7 +680,7 @@ void HLRAlgo_PolyInternalData::IncTData(
{
if (myNbTData >= myMxTData) {
#ifdef OCCT_DEBUG
if (TRACE)
if (HLRAlgo_PolyInternalData_TRACE)
cout << "HLRAlgo_PolyInternalData::IncTData : " << myMxTData << endl;
#endif
Standard_Integer i,j,k;
@@ -719,7 +719,7 @@ void HLRAlgo_PolyInternalData::IncPISeg(
{
if (myNbPISeg >= myMxPISeg) {
#ifdef OCCT_DEBUG
if (TRACE)
if (HLRAlgo_PolyInternalData_TRACE)
cout << "HLRAlgo_PolyInternalData::IncPISeg : " << myMxPISeg << endl;
#endif
Standard_Integer i,j,k;
@@ -757,7 +757,7 @@ void HLRAlgo_PolyInternalData::IncPINod(
{
if (myNbPINod >= myMxPINod) {
#ifdef OCCT_DEBUG
if (TRACE)
if (HLRAlgo_PolyInternalData_TRACE)
cout << "HLRAlgo_PolyInternalData::IncPINod : " << myMxPINod << endl;
#endif
Standard_Integer i,j,k;