From: ibs <ibs@opencascade.com>
Date: Tue, 9 Jul 2013 12:22:46 +0000 (+0400)
Subject: 0024048: "Basic Runtime Checks" option of VS projects should be equal to "RTC1"
X-Git-Tag: V6_7_1~41
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=1d106492dd57f9836c0d0a959ac6535411ec8419;p=occt-wok.git

0024048: "Basic Runtime Checks" option of VS projects should be equal to "RTC1"

set "Basic Runtime Checks" option of cmake meta-project and VC to "RTC1" (cmake default)
also copying of data folder is depend on install_tests option now
---

diff --git a/src/WOKTclLib/templates/template.cmake b/src/WOKTclLib/templates/template.cmake
index a094920..a10d472 100644
--- a/src/WOKTclLib/templates/template.cmake
+++ b/src/WOKTclLib/templates/template.cmake
@@ -74,11 +74,6 @@ ELSEIF(WIN32)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
 ENDIF()
 
-# switch Basic Runtime Checks to default state
-IF(MSVC AND "${BUILD_TYPE}" STREQUAL "Debug")
-  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-ENDIF()
-
 IF(WIN32)
   IF(NOT DEFINED MSVC70 AND NOT DEFINED MSVC80)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
@@ -497,8 +492,8 @@ IF("${INSTALL_DIR}" STREQUAL "")
 ELSE()
   # inc,data,tests DIRECTORY
   install(DIRECTORY "${CMAKE_SOURCE_DIR}/inc"   DESTINATION  "${INSTALL_DIR}" )
-  install(DIRECTORY "${CMAKE_SOURCE_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
   IF(INSTALL_TESTS)
+    install(DIRECTORY "${CMAKE_SOURCE_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
     install(DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
   ENDIF()
 
diff --git a/src/WOKTclLib/templates/template.vc10 b/src/WOKTclLib/templates/template.vc10
index 59fccfa..0692b74 100644
--- a/src/WOKTclLib/templates/template.vc10
+++ b/src/WOKTclLib/templates/template.vc10
@@ -134,6 +134,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -219,6 +220,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/WOKTclLib/templates/template.vc10x b/src/WOKTclLib/templates/template.vc10x
index 7b898e4..2e6dc97 100644
--- a/src/WOKTclLib/templates/template.vc10x
+++ b/src/WOKTclLib/templates/template.vc10x
@@ -133,6 +133,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -216,6 +217,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/WOKTclLib/templates/template.vc11 b/src/WOKTclLib/templates/template.vc11
index 9997059..81d936e 100644
--- a/src/WOKTclLib/templates/template.vc11
+++ b/src/WOKTclLib/templates/template.vc11
@@ -138,6 +138,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -223,6 +224,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/WOKTclLib/templates/template.vc11x b/src/WOKTclLib/templates/template.vc11x
index 2fa2447..f890247 100644
--- a/src/WOKTclLib/templates/template.vc11x
+++ b/src/WOKTclLib/templates/template.vc11x
@@ -137,6 +137,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -220,6 +221,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/WOKTclLib/templates/template.vc7 b/src/WOKTclLib/templates/template.vc7
index 0a22b5e..6d27ab0 100644
--- a/src/WOKTclLib/templates/template.vc7
+++ b/src/WOKTclLib/templates/template.vc7
@@ -90,6 +90,7 @@
 				Optimization="0"
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+        BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
 				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
diff --git a/src/WOKTclLib/templates/template.vc8 b/src/WOKTclLib/templates/template.vc8
index edf4c85..c1af5dd 100644
--- a/src/WOKTclLib/templates/template.vc8
+++ b/src/WOKTclLib/templates/template.vc8
@@ -149,6 +149,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
+        BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\..\..\..\win32\vc8\objd\__TKNAM__\__TKNAM__.pch"
 				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__TKNAM__/"
@@ -345,6 +346,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64"
 				ExceptionHandling="2"
+        BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\..\..\..\win64\vc8\objd\__TKNAM__\__TKNAM__.pch"
 				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__TKNAM__/"
diff --git a/src/WOKTclLib/templates/template.vc9 b/src/WOKTclLib/templates/template.vc9
index 60e71ba..8a03e9d 100644
--- a/src/WOKTclLib/templates/template.vc9
+++ b/src/WOKTclLib/templates/template.vc9
@@ -150,6 +150,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
+        BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\..\..\..\win32\vc9\objd\__TKNAM__\__TKNAM__.pch"
 				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__TKNAM__/"
@@ -339,6 +340,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64"
 				ExceptionHandling="2"
+        BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\..\..\..\win64\vc9\objd\__TKNAM__\__TKNAM__.pch"
 				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__TKNAM__/"