ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-12 01:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch V7_3_1_BR

Browse Source
This commit is contained in:
vsr 2014-04-03 14:15:51 +04:00
commit 4e4b3762fc
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -31,7 +31,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
@ -151,7 +151,7 @@ ENDIF(SALOME_BUILD_GUI)
##
FIND_PACKAGE(SalomeCAS REQUIRED)
FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
FIND_PACKAGE(SalomeVTK 6.1 REQUIRED)
# OpenCV
IF(SALOME_GEOM_USE_OPENCV)

13
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -110,14 +110,11 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb,
{
//work around PAL12004, PAL12628
//OSD::SetSignal( true );
bool raiseFPE;
#ifdef _DEBUG_
raiseFPE = true;
char* envDisableFPE = getenv("DISABLE_FPE");
if (envDisableFPE && atoi(envDisableFPE))
raiseFPE = false;
#else
raiseFPE = false;
bool raiseFPE = false;
#if defined(_DEBUG_) | defined(_DEBUG) //the Last for WIN32 default settings
char* envEnableFPE = getenv("ENABLE_FPE");
if (envEnableFPE && atoi(envEnableFPE))
raiseFPE = true;
#endif
OSD::SetSignal( raiseFPE );
}