]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
standardization of cmakization 2.
authorageay <ageay>
Thu, 7 Jun 2012 15:20:07 +0000 (15:20 +0000)
committerageay <ageay>
Thu, 7 Jun 2012 15:20:07 +0000 (15:20 +0000)
adm_local/cmake_files/FindCAS.cmake
adm_local/cmake_files/FindVTK.cmake

index de96d45c960c26232f35c80fd4dbef18053083db..4b72de6eb5548911afe046f87748744a8a99c0d6 100644 (file)
@@ -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)
 
index bf74db8abd66e40a3508720f754b8dbbbff35cd6..4e0871c89316d07b0b5914bc9244fa9bba55707e 100644 (file)
@@ -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