From: vsr Date: Tue, 23 Nov 2010 14:39:36 +0000 (+0000) Subject: Patch from Erwan ADAM for 64bit platforms X-Git-Tag: V5_1_5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV5_1_5_BR;p=modules%2Fgui.git Patch from Erwan ADAM for 64bit platforms --- diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake index 97e4835fb..a6f50a456 100644 --- a/adm_local/cmake_files/FindCAS.cmake +++ b/adm_local/cmake_files/FindCAS.cmake @@ -21,7 +21,7 @@ SET(CASROOT $ENV{CASROOT}) SET(OCC_VERSION_MAJOR 6) SET(OCC_VERSION_MINOR 3) -SET(OCC_VERSION_MAINTENANCE 0) +SET(OCC_VERSION_MAINTENANCE 10) SET(CAS_CPPFLAGS) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) @@ -33,6 +33,10 @@ SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) +IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) + SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -D_OCC64) +ENDIF(CMAKE_SIZEOF_VOID_P STREQUAL 8) + IF(NOT WINDOWS) FIND_LIBRARY(Xmu Xmu) IF(Xmu)