From ba1f802a7c7615b5b3b78c633ede61037d82cfda Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 4 Apr 2013 09:23:55 +0000 Subject: [PATCH] MEDMEM suppression --- src/MEDGUI/CMakeLists.txt | 3 +- src/MEDSPLITTER/CMakeLists.txt | 131 ---------------------------- src/MEDSPLITTER/Test/CMakeLists.txt | 117 ------------------------- src/MEDSPLITTER_Swig/CMakeLists.txt | 52 ----------- 4 files changed, 1 insertion(+), 302 deletions(-) delete mode 100644 src/MEDSPLITTER/CMakeLists.txt delete mode 100644 src/MEDSPLITTER/Test/CMakeLists.txt delete mode 100644 src/MEDSPLITTER_Swig/CMakeLists.txt diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt index 617197425..93571d22d 100644 --- a/src/MEDGUI/CMakeLists.txt +++ b/src/MEDGUI/CMakeLists.txt @@ -20,14 +20,13 @@ INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/UseQT4EXT.cmake) SET(MEDGUI_SOURCES - MEDGUI.cxx MEDGUIFileContentDial.cxx MEDGUISelection.cxx MEDGUISelectComponents.cxx MEDGUIDataBaseDockWidget.cxx ) -SET(MEDGUI_HEADERS MEDGUI.h MEDGUIFileContentDial.h MEDGUISelectComponents.h) +SET(MEDGUI_HEADERS MEDGUIFileContentDial.h MEDGUISelectComponents.h) SET(MEDGUI_FORMS MEDGUIFileContentDial.ui MEDGUISelectComponents.ui) #SET(MEDGUI_RESOURCES images.qrc) diff --git a/src/MEDSPLITTER/CMakeLists.txt b/src/MEDSPLITTER/CMakeLists.txt deleted file mode 100644 index 2b302b540..000000000 --- a/src/MEDSPLITTER/CMakeLists.txt +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D -# -# 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. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -IF(CPPUNIT_IS_OK) - ADD_SUBDIRECTORY(Test) -ENDIF(CPPUNIT_IS_OK) - -INCLUDE_DIRECTORIES( - ${PARMETIS_INCLUDE_DIRS} - ${METIS_INCLUDE_DIRS} - ${SCOTCH_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} - ${METIS_INCLUDE_DIRS} - ${LIBXML_INCLUDE_DIRS} - ${MED3_INCLUDE_DIRS} - ${HDF5_INCLUDE_DIRS} - ${MPI_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/ExprEval - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints - ) - -SET(medsplittercpp_HEADERS_HXX - MEDSPLITTER_Topology.hxx - MEDSPLITTER_MESHCollection.hxx - MEDSPLITTER_MESHCollection.H - MEDSPLITTER_MESHCollectionDriver.H - MEDSPLITTER_MESHCollectionMedXMLDriver.H - MEDSPLITTER_MESHCollectionMedAsciiDriver.H - MEDSPLITTER_MESHCollectionDriver.hxx - MEDSPLITTER_MESHCollectionMedXMLDriver.hxx - MEDSPLITTER_MESHCollectionMedAsciiDriver.hxx - MEDSPLITTER_ParallelTopology.hxx - MEDSPLITTER_FaceModel.hxx - MEDSPLITTER_Graph.hxx - MEDSPLITTER_UserGraph.hxx - MEDSPLITTER_API.hxx - MEDSPLITTER_SequentialTopology.hxx - MEDSPLITTER_utils.hxx - MEDSPLITTER.hxx - MEDSPLITTER_ParaDomainSelector.hxx - MEDSPLITTER_MeshSendReceive.hxx - MEDSPLITTER_JointExchangeData.hxx - ) - -SET(medsplittercpp_SOURCES - MEDSPLITTER_MESHCollection.cxx - MEDSPLITTER_MESHCollectionDriver.cxx - MEDSPLITTER_MESHCollectionMedXMLDriver.cxx - MEDSPLITTER_MESHCollectionMedAsciiDriver.cxx - MEDSPLITTER_ParallelTopology.cxx - MEDSPLITTER_Graph.cxx - MEDSPLITTER_UserGraph.cxx - MEDSPLITTER_API.cxx - MEDSPLITTER_ParaDomainSelector.cxx - MEDSPLITTER_MeshSendReceive.cxx - MEDSPLITTER_JointExchangeData.cxx - ) - -SET(medsplittercpp_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${LIBXML_DEFINITIONS} ${MPI_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -SET(medsplittercpp_LDFLAGS medmem ${LIBXML_LIBS} interpkernel ${MPI_LIBS} ${HDF5_LIBS} ${MED3_LIBS_C_ONLY} ${STDLIB} ${PLATFORM_LIBS}) - -IF(MED_ENABLE_SCOTCH) - SET(medsplittercpp_SOURCES ${medsplittercpp_SOURCES} MEDSPLITTER_SCOTCHGraph.cxx) - SET(medsplittercpp_HEADERS_HXX ${medsplittercpp_HEADERS_HXX} MEDSPLITTER_SCOTCHGraph.hxx) - SET(medsplittercpp_DEFINITIONS "${medsplittercpp_DEFINITIONS} ${SCOTCH_DEFINITIONS}") - SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${SCOTCH_LIBS}) -ENDIF(MED_ENABLE_SCOTCH) - -IF(MED_ENABLE_METIS) - SET(medsplittercpp_HEADERS_HXX ${medsplittercpp_HEADERS_HXX} MEDSPLITTER_METISGraph.hxx) -ENDIF(MED_ENABLE_METIS) - -IF(MPI_IS_OK) - IF(MED_ENABLE_PARMETIS) - SET(medsplittercpp_SOURCES ${medsplittercpp_SOURCES} MEDSPLITTER_METISGraph.cxx) - SET(medsplittercpp_DEFINITIONS "${medsplittercpp_DEFINITIONS} ${MPI_DEFINITIONS} ${PARMETIS_DEFINITIONS}") - SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${PARMETIS_LIBS}) - ENDIF(MED_ENABLE_PARMETIS) -ELSE(MPI_IS_OK) - IF(MED_ENABLE_METIS) - SET(medsplittercpp_SOURCES ${medsplittercpp_SOURCES} MEDSPLITTER_METISGraph.cxx) - SET(medsplittercpp_DEFINITIONS "${medsplittercpp_DEFINITIONS} ${METIS_DEFINITIONS}") - SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${METIS_LIBS}) - ENDIF(MED_ENABLE_METIS) -ENDIF(MPI_IS_OK) - -SET(medsplitter_LDFLAGS ${medsplittercpp_LDFLAGS}) -IF(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) - SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${BOSST_LIBS} ${SALOMELocalTrace}) - SET(medsplitter_LDFLAGS ${medsplittercpp_LDFLAGS} ${SALOMEBasics}) -ENDIF(MED_ENABLE_KERNEL) - -ADD_EXECUTABLE(medsplitter medsplitter.cxx) -SET_TARGET_PROPERTIES(medsplitter PROPERTIES COMPILE_FLAGS "${medsplittercpp_DEFINITIONS}") -TARGET_LINK_LIBRARIES(medsplitter medsplittercpp ${medsplitter_LDFLAGS}) -INSTALL(TARGETS medsplitter DESTINATION ${MED_salomebin_BINS}) - -IF(MPI_IS_OK) - ADD_EXECUTABLE(medsplitter_para medsplitter_para.cxx) - SET_TARGET_PROPERTIES(medsplitter_para PROPERTIES COMPILE_FLAGS "${medsplittercpp_DEFINITIONS}") - TARGET_LINK_LIBRARIES(medsplitter_para medsplittercpp ${medsplitter_LDFLAGS}) - INSTALL(TARGETS medsplitter_para DESTINATION ${MED_salomebin_BINS}) -ENDIF(MPI_IS_OK) - -ADD_LIBRARY(medsplittercpp SHARED ${medsplittercpp_SOURCES}) -SET_TARGET_PROPERTIES(medsplittercpp PROPERTIES COMPILE_FLAGS "${medsplittercpp_DEFINITIONS}") -TARGET_LINK_LIBRARIES(medsplittercpp ${medsplittercpp_LDFLAGS}) -INSTALL(TARGETS medsplittercpp DESTINATION ${MED_salomelib_LIBS}) - -INSTALL(FILES ${medsplittercpp_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) diff --git a/src/MEDSPLITTER/Test/CMakeLists.txt b/src/MEDSPLITTER/Test/CMakeLists.txt deleted file mode 100644 index 987a14ea4..000000000 --- a/src/MEDSPLITTER/Test/CMakeLists.txt +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D -# -# 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. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -INCLUDE_DIRECTORIES( - ${PARMETIS_INCLUDE_DIRS} - ${METIS_INCLUDE_DIRS} - ${SCOTCH_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} - ${CPPUNIT_INCLUDE_DIRS} - ${LIBXML_INCLUDE_DIRS} - ${MED3_INCLUDE_DIRS} - ${HDF5_INCLUDE_DIRS} - ${MPI_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDMEM - ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNELTest # for BasicMainTest.cxx - ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL - ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases - ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Geometric2D - ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/ExprEval - ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/GaussPoints -) - -SET(MEDSPLITTERTest_HEADERS_HXX - MEDSPLITTERTest.hxx - MEDSPLITTERTest_Utils.hxx - MEDSPLITTERTest_defs.hxx -) - -SET(MEDSPLITTERTest_SOURCES - MEDSPLITTERTest.cxx - MEDSPLITTERTest_MESHCollection.cxx - MEDSPLITTERTest_ParallelTopology.cxx - MEDSPLITTERTest_Utils.cxx -) - -SET(MEDSPLITTERTest_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${LIBXML_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${MPI_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -SET(MEDSPLITTERTest_LDFLAGS ${CPPUNIT_LIBS} ${MED3_LIBS_C_ONLY} medsplittercpp) - -IF(MED_ENABLE_PARMETIS) - SET(MEDSPLITTERTest_SOURCES - ${MEDSPLITTERTest_SOURCES} - ParaMEDSPLITTERTest_MeshSendReceive.cxx - ParaMEDSPLITTERTest_ParaDomainSelector.cxx - ParaMEDSPLITTERTest_medsplitter_para.cxx - ParaMEDSPLITTERTest.hxx - ) - SET(MEDSPLITTERTest_DEFINITIONS "${MEDSPLITTERTest_DEFINITIONS} ${PARMETIS_DEFINITIONS}") - SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${PARMETIS_LIBS}) -ENDIF(MED_ENABLE_PARMETIS) - -IF(MED_ENABLE_METIS) - SET(MEDSPLITTERTest_DEFINITIONS "${MEDSPLITTERTest_DEFINITIONS} ${METIS_DEFINITIONS}") - SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${METIS_LIBS}) -ENDIF(MED_ENABLE_METIS) - -IF(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) - SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${SALOMELocalTrace}) -ENDIF(MED_ENABLE_KERNEL) - -IF(MED_ENABLE_SCOTCH) - SET(MEDSPLITTERTest_DEFINITIONS "${MEDSPLITTERTest_DEFINITIONS} ${SCOTCH_DEFINITIONS}") - SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${SCOTCH_LIBS}) -ENDIF(MED_ENABLE_SCOTCH) - -SET(SCRIPTS testMEDSPLITTER.py) - - - -IF(MPI_IS_OK) - IF(MED_ENABLE_PARMETIS) - SET(TestParaMEDSPLITTER_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} MEDSPLITTERTest medmem interpkernel medsplittercpp) - SET(SCRIPTS ${SCRIPTS} testMEDSPLITTER.py) - - ADD_EXECUTABLE(TestParaMEDSPLITTER TestParaMEDSPLITTER.cxx) - SET_TARGET_PROPERTIES(TestParaMEDSPLITTER PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_DEFINITIONS}") - TARGET_LINK_LIBRARIES(TestParaMEDSPLITTER ${TestParaMEDSPLITTER_LDFLAGS}) - INSTALL(TARGETS TestParaMEDSPLITTER DESTINATION ${MED_salomebin_BINS}) - ENDIF(MED_ENABLE_PARMETIS) -ELSE(MPI_IS_OK) - IF(MED_ENABLE_METIS) - SET(TestMEDSPLITTER_LDFLAGS ${MEDSPLITTERTest_LDFLAGSS} MEDSPLITTERTest medmem interpkernel medsplittercpp) - IF(MED_ENABLE_KERNEL) - SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${SALOMEBasics}) - ENDIF(MED_ENABLE_KERNEL) - - ADD_EXECUTABLE(TestMEDSPLITTER TestMEDSPLITTER.cxx) - SET_TARGET_PROPERTIES(TestMEDSPLITTER PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_DEFINITIONS}") - TARGET_LINK_LIBRARIES(TestMEDSPLITTER ${TestMEDSPLITTER_LDFLAGS}) - INSTALL(TARGETS TestMEDSPLITTER DESTINATION ${MED_salomebin_BINS}) - ENDIF(MED_ENABLE_METIS) -ENDIF(MPI_IS_OK) - -ADD_LIBRARY(MEDSPLITTERTest SHARED ${MEDSPLITTERTest_SOURCES}) -SET_TARGET_PROPERTIES(MEDSPLITTERTest PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_DEFINITIONS}") -TARGET_LINK_LIBRARIES(MEDSPLITTERTest ${MEDSPLITTERTest_LDFLAGS}) -INSTALL(TARGETS MEDSPLITTERTest DESTINATION ${MED_salomelib_LIBS}) - -INSTALL(FILES ${MEDSPLITTERTest_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL(FILES ${SCRIPTS} DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDSPLITTER_Swig/CMakeLists.txt b/src/MEDSPLITTER_Swig/CMakeLists.txt deleted file mode 100644 index 27e0470c4..000000000 --- a/src/MEDSPLITTER_Swig/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D -# -# 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. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -FIND_PACKAGE(SWIG REQUIRED) -INCLUDE(${SWIG_USE_FILE}) - -SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") - -INCLUDE_DIRECTORIES( - ${PYTHON_INCLUDE_DIRS} - ${MED3_INCLUDE_DIRS} - ${HDF5_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../MEDSPLITTER - ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM - ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM_SWIG - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/ExprEval - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints - ) - -SWIG_ADD_MODULE(libMEDSPLITTER_Swig python libMEDSPLITTER_Swig.i) -SWIG_LINK_LIBRARIES(libMEDSPLITTER_Swig ${PYTHON_LIBS} medsplittercpp) -SET_TARGET_PROPERTIES(_libMEDSPLITTER_Swig PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -IF(${MACHINE} STREQUAL WINDOWS) - SET_TARGET_PROPERTIES(_libMEDSPLITTER_Swig PROPERTIES DEBUG_OUTPUT_NAME _libMEDSPLITTER_Swig_d) -ENDIF(${MACHINE} STREQUAL WINDOWS) -INSTALL(TARGETS _libMEDSPLITTER_Swig DESTINATION ${MED_salomepythondir}) -INSTALL(FILES libMEDSPLITTER_Swig.i DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libMEDSPLITTER_Swig.py DESTINATION ${MED_salomepythondir}) -INSTALL(FILES MEDSPLITTER.py test_MEDSPLITTER.py DESTINATION ${MED_salomescript_DATA}) - -- 2.39.2