diff --git a/CMakeLists.txt b/CMakeLists.txt index 511585319..1300477fc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 5a9685b5d..f51456c46 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -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 ); }