From: ageay Date: Thu, 7 Jun 2012 15:20:07 +0000 (+0000) Subject: standardization of cmakization 2. X-Git-Tag: B4WheelZoom~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d7816a13bc8b08b51b88443bec101ba19457d793;p=modules%2Fgui.git standardization of cmakization 2. --- diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake index de96d45c9..4b72de6eb 100644 --- a/adm_local/cmake_files/FindCAS.cmake +++ b/adm_local/cmake_files/FindCAS.cmake @@ -38,13 +38,13 @@ SET(CAS_CPPFLAGS) # 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_FLAGS "-DLIN -DLINTEL -DCSFDB") +SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception) -SET(CAS_FLAGS "${CAS_FLAGS} -DNo_exception") +SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H) -SET(CAS_FLAGS "${CAS_FLAGS} -DHAVE_CONFIG_H") +SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H) -SET(CAS_FLAGS "${CAS_FLAGS} -DHAVE_LIMITS_H") +SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_LIMITS_H") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) # to be removed SET(CAS_INCLUDE_DIRS ${CASROOT}/inc) diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake index bf74db8ab..4e0871c89 100644 --- a/adm_local/cmake_files/FindVTK.cmake +++ b/adm_local/cmake_files/FindVTK.cmake @@ -65,3 +65,4 @@ FIND_LIBRARY(vtkPythonCore vtkPythonCore PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PA #ENDIF(NOT WINDOWS) SET(VTK_INCLUDES ${VTK_INCLUDES} -DVTK_EXCLUDE_STRSTREAM_HEADERS) +SET(VTK_DEFINITIONS -DVTK_EXCLUDE_STRSTREAM_HEADERS) \ No newline at end of file