From: rnv Date: Thu, 24 Oct 2013 09:13:03 +0000 (+0000) Subject: Disable iterator debugging on WIN32 platform. X-Git-Tag: V7_3_0a1~59 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a4579e24c87968417fa8db7971700963fc4525f5;p=modules%2Fmed.git Disable iterator debugging on WIN32 platform. --- diff --git a/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake b/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake index 226f38c7d..a8517a460 100755 --- a/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake +++ b/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake @@ -93,10 +93,14 @@ IF(WIN32) SET(PLATFORM_LIBS Ws2_32.lib) LIST(APPEND PLATFORM_LIBS Userenv.lib) # At least for GEOM suit - - IF(MACHINE_IS_64) + + # Disable iterator debugging on WINDOWS in Debug Mode + IF(NOT CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ADD_DEFINITIONS(-D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0) ADD_DEFINITIONS(-D_HAS_ITERATOR_DEBUGGING=0) # To avoid runtime error during checking iterators + ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") + + IF(MACHINE_IS_64) SET(SIZE_OF_LONG 4) # set sizeof(long) to 4 byte ELSE() SET(SIZE_OF_LONG ${CMAKE_SIZEOF_VOID_P}) # set sizeof(long) the same as size of pointers