]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Patch from Erwan ADAM for 64bit platforms V5_1_5_BR V5_1_5 V5_1_5_patch02 V5_1_5rc3
authorvsr <vsr@opencascade.com>
Tue, 23 Nov 2010 14:39:36 +0000 (14:39 +0000)
committervsr <vsr@opencascade.com>
Tue, 23 Nov 2010 14:39:36 +0000 (14:39 +0000)
adm_local/cmake_files/FindCAS.cmake

index 97e4835fbb0d12d68dcabeb44348aa15395417f2..a6f50a4563578fb0225ce6d24ab720e820fca531 100644 (file)
@@ -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)