From 57bf3809ac32a4a959feae0e3bae5d2530ee47d8 Mon Sep 17 00:00:00 2001 From: ageay Date: Mon, 8 Jul 2013 10:42:28 +0000 Subject: [PATCH] addition of numpy --- src/MEDCouplingCorba_Swig/Client/CMakeLists.txt | 4 ++-- src/MEDCoupling_Swig/CMakeLists.txt | 8 ++++---- src/MEDLoader/Swig/CMakeLists.txt | 4 ++-- src/ParaMEDMEM_Swig/CMakeLists.txt | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt index 5478b30e3..7fd745e17 100644 --- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt @@ -23,9 +23,9 @@ INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_DEFINITIONS "-shadow") -IF(NUMPY_STATUS) +IF(NUMPY_FOUND) SET(SWIG_MODULE_MEDCouplingClient_EXTRA_FLAGS -DWITH_NUMPY) -ENDIF(NUMPY_STATUS) +ENDIF(NUMPY_FOUND) INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt index 0036a2081..d8859f7f6 100644 --- a/src/MEDCoupling_Swig/CMakeLists.txt +++ b/src/MEDCoupling_Swig/CMakeLists.txt @@ -56,9 +56,9 @@ SET_TARGET_PROPERTIES(${SWIG_MODULE_MEDCoupling_REAL_NAME} PROPERTIES COMPILE_FL SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_DEFINITIONS "-shadow") -IF(NUMPY_STATUS) +IF(NUMPY_FOUND) SET(SWIG_MODULE_MEDCouplingRemapper_EXTRA_FLAGS -DWITH_NUMPY) -ENDIF(NUMPY_STATUS) +ENDIF(NUMPY_FOUND) # _ABR_ Ensure dependency mechanism on all SWIG files and headers SET (SWIG_MODULE_MEDCouplingRemapper_EXTRA_DEPS ${MEDCoupling_SWIG_DPYS_FILES} @@ -84,6 +84,6 @@ INSTALL(FILES MEDCouplingBasicsTest.py MEDCouplingRemapperTest.py MEDCouplingDat ADD_TEST(MEDCouplingBasicsTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingBasicsTest.py) ADD_TEST(MEDCouplingExamplesTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingExamplesTest.py) ADD_TEST(MEDCouplingRemapperTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingRemapperTest.py) -IF(NUMPY_STATUS) +IF(NUMPY_FOUND) ADD_TEST(MEDCouplingNumPyTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingNumPyTest.py) -ENDIF(NUMPY_STATUS) +ENDIF(NUMPY_FOUND) diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt index fa0450b1f..3a409c36b 100644 --- a/src/MEDLoader/Swig/CMakeLists.txt +++ b/src/MEDLoader/Swig/CMakeLists.txt @@ -23,9 +23,9 @@ INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES SWIG_DEFINITIONS "-shadow") -IF(NUMPY_STATUS) +IF(NUMPY_FOUND) SET(SWIG_MODULE_MEDLoader_EXTRA_FLAGS -DWITH_NUMPY) -ENDIF(NUMPY_STATUS) +ENDIF(NUMPY_FOUND) SET (MEDLoader_SWIG_DPYS_FILES MEDLoaderCommon.i diff --git a/src/ParaMEDMEM_Swig/CMakeLists.txt b/src/ParaMEDMEM_Swig/CMakeLists.txt index 97f7ed931..a9cefc28d 100644 --- a/src/ParaMEDMEM_Swig/CMakeLists.txt +++ b/src/ParaMEDMEM_Swig/CMakeLists.txt @@ -24,9 +24,9 @@ INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES SWIG_DEFINITIONS "-shadow") -IF(NUMPY_STATUS) +IF(NUMPY_FOUND) SET(SWIG_MODULE_ParaMEDMEM_EXTRA_FLAGS -DWITH_NUMPY) -ENDIF(NUMPY_STATUS) +ENDIF(NUMPY_FOUND) SET (ParaMEDMEM_SWIG_DPYS_FILES ParaMEDMEM.typemap) @@ -57,9 +57,9 @@ SWIG_LINK_LIBRARIES(ParaMEDMEM ${PYTHON_LIBS} paramedmem medloader) SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES SWIG_DEFINITIONS "-shadow") -IF(NUMPY_STATUS) +IF(NUMPY_FOUND) SET(SWIG_MODULE_ParaMEDMEM_EXTRA_FLAGS -DWITH_NUMPY) -ENDIF(NUMPY_STATUS) +ENDIF(NUMPY_FOUND) INSTALL(TARGETS _ParaMEDMEM DESTINATION ${SALOME_INSTALL_PYTHON}) INSTALL(FILES ParaMEDMEM.i DESTINATION ${SALOME_INSTALL_HEADERS}) -- 2.39.2