From: adam Date: Fri, 18 Feb 2011 11:50:46 +0000 (+0000) Subject: Remove the occ version flags. X-Git-Tag: V6_3_0a1~57 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2abb32bb3f0c87178274cc6dec30b2a43737be14;p=modules%2Fgui.git Remove the occ version flags. They implies collisions in code. --- diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake index a6f50a456..14d997686 100644 --- a/adm_local/cmake_files/FindCAS.cmake +++ b/adm_local/cmake_files/FindCAS.cmake @@ -19,14 +19,14 @@ SET(CASROOT $ENV{CASROOT}) -SET(OCC_VERSION_MAJOR 6) -SET(OCC_VERSION_MINOR 3) -SET(OCC_VERSION_MAINTENANCE 10) +# SET(OCC_VERSION_MAJOR 6) +# SET(OCC_VERSION_MINOR 3) +# SET(OCC_VERSION_MAINTENANCE 10) SET(CAS_CPPFLAGS) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MINOR=${OCC_VERSION_MINOR}) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAINTENANCE=${OCC_VERSION_MAINTENANCE}) +# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) +# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MINOR=${OCC_VERSION_MINOR}) +# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAINTENANCE=${OCC_VERSION_MAINTENANCE}) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DLIN -DLINTEL -DCSFDB) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H)