From: inv Date: Wed, 16 Oct 2013 17:11:38 +0000 (+0000) Subject: Synchronize adm files X-Git-Tag: V7_3_0a1~87 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3b4b8b681420ea9560415b5c2d2181ba3211f611;p=modules%2Fmed.git Synchronize adm files --- diff --git a/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake b/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake index 20c9b3036..226f38c7d 100755 --- a/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake +++ b/adm_local_without_kernel/cmake_files/SalomeSetupPlatform.cmake @@ -82,7 +82,6 @@ ENDIF() # ENDIF(CMAKE_BUILD_TYPE STREQUAL Release) #ENDIF() - IF(WIN32) ## Windows specific: ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) # To disable windows warnings for strcpy, fopen, ... @@ -98,7 +97,9 @@ IF(WIN32) IF(MACHINE_IS_64) 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 - SET(SIZE_OF_LONG "4") # set sizeof(long) to 4 byte + 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 ENDIF() ELSE() ## Linux specific: