X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=28ef1e18124d7967f79a2fb395b5cca109f63290;hb=d16c2cf3ff23f9f8a56397d850d850fb2dcffaca;hp=feb00d5e156b7bf755f423d012c33f3f4c941707;hpb=76ca345ec9463bc23aa1abec82a5dffb9c5926c0;p=tools%2Fmedcoupling.git diff --git a/CMakeLists.txt b/CMakeLists.txt index feb00d5e1..28ef1e181 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ CMAKE_POLICY(SET CMP0003 NEW) 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}) @@ -191,6 +191,14 @@ IF(SALOME_MED_ENABLE_PYTHON) 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 @@ -258,9 +266,7 @@ IF(WIN32) 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)