From 7a59f4ce9f45dcbb17d7ea2cdaf76e314b4bb9f6 Mon Sep 17 00:00:00 2001 From: ski Date: Tue, 13 Dec 2016 15:30:45 +0300 Subject: [PATCH] 0028198: Add FPE signals enabling from CMake CMake variable BUILD_ENABLE_FPE_SIGNAL_HANDLER was added to enable FPE signals during runtime. Updated description of BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR variable. --- CMakeLists.txt | 11 +++++++++++ adm/cmake/vardescr.cmake | 5 +++++ adm/templates/custom.build.bat.in | 3 +++ adm/templates/custom.build.sh.in | 3 +++ adm/templates/custom.install.bat.in | 3 +++ adm/templates/custom.install.sh.in | 3 +++ dox/dev_guides/building/cmake/cmake.md | 1 + 7 files changed, 29 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8ee36b09a..37d38648e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,6 +338,17 @@ if (WIN32) set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}") endif() +# Enable/Disable the floating point exceptions (FPE) during runtime. +if (NOT BUILD_ENABLE_FPE_SIGNAL_HANDLER) + set (BUILD_ENABLE_FPE_SIGNAL_HANDLER OFF CACHE BOOL "${BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR}" FORCE) +endif() + +if (BUILD_ENABLE_FPE_SIGNAL_HANDLER) + set (BUILD_ENABLE_FPE_SIGNAL_HANDLER 1) +else() + set (BUILD_ENABLE_FPE_SIGNAL_HANDLER 0) +endif() + # include the patched or original list of modules # list _TOOLKITS is created foreach module and contains its toolkits # list will contain all modules diff --git a/adm/cmake/vardescr.cmake b/adm/cmake/vardescr.cmake index bf578f87e5..f8bab3b495 100644 --- a/adm/cmake/vardescr.cmake +++ b/adm/cmake/vardescr.cmake @@ -28,6 +28,11 @@ Applies only for Debug configuration.") set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR "Append the postfix to names of output libraries") +set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR +"Enable/Disable the floating point exceptions (FPE) during DRAW execution only. +Corresponding environment variable (CSF_FPE) can be changed manually +in custom.bat/sh scripts without regeneration by CMake.") + # install variables set (INSTALL_DIR_DESCR "The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable), diff --git a/adm/templates/custom.build.bat.in b/adm/templates/custom.build.bat.in index 7682b07697..25cc9c0971 100644 --- a/adm/templates/custom.build.bat.in +++ b/adm/templates/custom.build.bat.in @@ -2,6 +2,9 @@ echo off if /I "%VCVER%" == "@COMPILER@" ( if "%ARCH%" == "@COMPILER_BITNESS@" ( + rem set environment variables used by OCCT + set CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ + set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@" set "TK_DIR=@3RDPARTY_TK_DLL_DIR@" set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@" diff --git a/adm/templates/custom.build.sh.in b/adm/templates/custom.build.sh.in index 1c87faab5a..6830a6bf03 100644 --- a/adm/templates/custom.build.sh.in +++ b/adm/templates/custom.build.sh.in @@ -2,6 +2,9 @@ if [ "$1" == "@BIN_LETTER@" ]; then if [ "$2" == "@COMPILER_BITNESS@" ]; then + # set environment variables used by OCCT + export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ + export TCL_DIR="@3RDPARTY_TCL_LIBRARY_DIR@" export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@" export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@" diff --git a/adm/templates/custom.install.bat.in b/adm/templates/custom.install.bat.in index 7ddd9d42d5..4cdd0b8d35 100644 --- a/adm/templates/custom.install.bat.in +++ b/adm/templates/custom.install.bat.in @@ -4,6 +4,9 @@ rem CASDEB comes as third argument if /I "%VCVER%" == "@COMPILER@" ( if "%ARCH%" == "@COMPILER_BITNESS@" ( + rem set environment variables used by OCCT + set CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ + set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@" set "TK_DIR=@USED_3RDPARTY_TK_DIR@" set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@" diff --git a/adm/templates/custom.install.sh.in b/adm/templates/custom.install.sh.in index 4a8a8e7c32..855970a43d 100644 --- a/adm/templates/custom.install.sh.in +++ b/adm/templates/custom.install.sh.in @@ -2,6 +2,9 @@ if [ "$1" == "@BIN_LETTER@" ]; then if [ "$2" == "@COMPILER_BITNESS@" ]; then + # set environment variables used by OCCT + export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@ + export TCL_DIR="@USED_3RDPARTY_TCL_DIR@" export TK_DIR="@USED_3RDPARTY_TK_DIR@" export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@" diff --git a/dox/dev_guides/building/cmake/cmake.md b/dox/dev_guides/building/cmake/cmake.md index 5b334f2da5..bdfa189b01 100644 --- a/dox/dev_guides/building/cmake/cmake.md +++ b/dox/dev_guides/building/cmake/cmake.md @@ -100,6 +100,7 @@ The following table gives the full list of environment variables used at the con | BUILD_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this option leads to automatic search of Doxygen binaries. Its building calls Doxygen command to generate the documentation in HTML format | | BUILD_PATCH | Path | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution | | BUILD_WITH_DEBUG | Boolean flag | Enables extended messages of many OCCT algorithms, usually printed to cout. These include messages on internal errors and special cases encountered, timing, etc. | +| BUILD_ENABLE_FPE_SIGNAL_HANDLER | Boolean flag | Enable/Disable the floating point exceptions (FPE) during DRAW execution only. Corresponding environment variable (CSF_FPE) can be changed manually in custom.bat/sh scripts without regeneration by CMake. | | CMAKE_CONFIGURATION_TYPES | String | Semicolon-separated CMake configurations | | INSTALL_DIR | Path | Points to the installation directory. *INSTALL_DIR* is a synonym of *CMAKE_INSTALL_PREFIX*. The user can specify both *INSTALL_DIR* or *CMAKE_INSTALL_PREFIX* | | INSTALL_DIR_BIN | Path | Relative path to the binaries installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_BIN}) |