-# Copyright (C) 2012-2013 CEA/DEN, EDF R&D
+# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
IF(NOT SALOME_MED_STANDALONE)
FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
ENDIF(NOT SALOME_MED_STANDALONE)
+ # Set the extra flags for SWIG for numpy and scipy
+ SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY)
+ IF(NUMPY_FOUND)
+ SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "-DWITH_NUMPY")
+ ENDIF(NUMPY_FOUND)
+ IF(SCIPY_FOUND)
+ SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY};-DWITH_SCIPY")
+ ENDIF(SCIPY_FOUND)
ENDIF(SALOME_MED_ENABLE_PYTHON)
# Detection report
ENDIF(WIN32)
ADD_SUBDIRECTORY(src)
-IF(NOT SALOME_MED_STANDALONE)
- ADD_SUBDIRECTORY(adm_local)
-ENDIF(NOT SALOME_MED_STANDALONE)
+ADD_SUBDIRECTORY(adm_local)
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)