From 18afec3260c78b269aafebac78be3c0ee67e52dd Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Tue, 24 Sep 2024 10:43:59 +0200 Subject: [PATCH] bos #42837: quick review of Nabil work --- src/ShapeRecogn/CMakeLists.txt | 14 +++----------- src/ShapeRecogn/Nodes.cxx | 5 ----- src/ShapeRecogn/Nodes.hxx | 1 - src/ShapeRecogn/ShapeRecognMesh.cxx | 5 ----- src/ShapeRecogn/ShapeRecognMesh.hxx | 1 - src/ShapeRecogn/ShapeRecognMeshBuilder.cxx | 4 ---- src/ShapeRecogn/ShapeRecognMeshBuilder.hxx | 1 - src/ShapeRecogn/Test/CMakeLists.txt | 1 - 8 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/ShapeRecogn/CMakeLists.txt b/src/ShapeRecogn/CMakeLists.txt index 5d20a47c9..b312932e1 100644 --- a/src/ShapeRecogn/CMakeLists.txt +++ b/src/ShapeRecogn/CMakeLists.txt @@ -53,17 +53,9 @@ SET(shaperecogn_SOURCES ADD_LIBRARY(shaperecogn ${shaperecogn_SOURCES}) SET_TARGET_PROPERTIES(shaperecogn PROPERTIES COMPILE_FLAGS "") -# if(WIN32) - # add_library(shaperecogn_lib STATIC ${shaperecogn_SOURCES}) - # TARGET_LINK_LIBRARIES(shaperecogn_lib medcouplingcpp ${LAPACK_LIBRARIES}) - # set_target_properties(shaperecogn_lib PROPERTIES OUTPUT_NAME shaperecogn) - # INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) - # INSTALL(TARGETS shaperecogn_lib DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) - # TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp ${LAPACK_LIBRARIES}) -# else(WIN32) - TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp ${LAPACK_LIBRARIES}) - INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) -# endif(WIN32) +TARGET_LINK_LIBRARIES(shaperecogn medcouplingcpp ${LAPACK_LIBRARIES}) +INSTALL(TARGETS shaperecogn EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) + FILE(GLOB shaperecogn_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") # To allow usage as SWIG dependencies: diff --git a/src/ShapeRecogn/Nodes.cxx b/src/ShapeRecogn/Nodes.cxx index 61f295dd9..885c90868 100644 --- a/src/ShapeRecogn/Nodes.cxx +++ b/src/ShapeRecogn/Nodes.cxx @@ -29,11 +29,6 @@ Nodes::Nodes( { } -Nodes::~Nodes() -{ - -} - mcIdType Nodes::getNbNodes() const { return coords->getNumberOfTuples(); diff --git a/src/ShapeRecogn/Nodes.hxx b/src/ShapeRecogn/Nodes.hxx index 47347bfdc..4122fd303 100644 --- a/src/ShapeRecogn/Nodes.hxx +++ b/src/ShapeRecogn/Nodes.hxx @@ -34,7 +34,6 @@ namespace MEDCoupling Nodes(const MEDCouplingUMesh *mesh, const DataArrayInt64 *neighbors, const DataArrayInt64 *neighborsIdx); - virtual ~Nodes(); mcIdType getNbNodes() const; const std::vector &getK1() const; diff --git a/src/ShapeRecogn/ShapeRecognMesh.cxx b/src/ShapeRecogn/ShapeRecognMesh.cxx index 3e29ea7ad..61b664d09 100644 --- a/src/ShapeRecogn/ShapeRecognMesh.cxx +++ b/src/ShapeRecogn/ShapeRecognMesh.cxx @@ -29,11 +29,6 @@ ShapeRecognMesh::ShapeRecognMesh() { } -ShapeRecognMesh::~ShapeRecognMesh() -{ - -} - std::size_t ShapeRecognMesh::getHeapMemorySizeWithoutChildren() const { return 0; diff --git a/src/ShapeRecogn/ShapeRecognMesh.hxx b/src/ShapeRecogn/ShapeRecognMesh.hxx index 1cacedfd0..c6df41fb5 100644 --- a/src/ShapeRecogn/ShapeRecognMesh.hxx +++ b/src/ShapeRecogn/ShapeRecognMesh.hxx @@ -61,7 +61,6 @@ namespace MEDCoupling protected: ShapeRecognMesh(); - virtual ~ShapeRecognMesh(); private: MCAuto nodeK1; diff --git a/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx b/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx index 375443db8..bbfcd19cf 100644 --- a/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx +++ b/src/ShapeRecogn/ShapeRecognMeshBuilder.cxx @@ -34,10 +34,6 @@ using namespace MEDCoupling; -ShapeRecognMeshBuilder::~ShapeRecognMeshBuilder() -{ - //comment -} ShapeRecognMeshBuilder::ShapeRecognMeshBuilder(MCAuto< MEDCouplingUMesh > mesh) { assign( mesh ); diff --git a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx index 735e28eb5..402131905 100644 --- a/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx +++ b/src/ShapeRecogn/ShapeRecognMeshBuilder.hxx @@ -42,7 +42,6 @@ namespace MEDCoupling public: ShapeRecognMeshBuilder(MCAuto< MEDCouplingUMesh > mesh); ShapeRecognMeshBuilder(MEDCouplingUMesh *mesh); - virtual ~ShapeRecognMeshBuilder(); const Nodes *getNodes() const; const Areas *getAreas() const; diff --git a/src/ShapeRecogn/Test/CMakeLists.txt b/src/ShapeRecogn/Test/CMakeLists.txt index 953fa8137..be7145664 100644 --- a/src/ShapeRecogn/Test/CMakeLists.txt +++ b/src/ShapeRecogn/Test/CMakeLists.txt @@ -47,7 +47,6 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) IF(NOT MEDCOUPLING_MICROMED) SET(TESTSHAPE_RECOGN0 TestShapeRecogn) ADD_EXECUTABLE(${TESTSHAPE_RECOGN0} ${TestShapeRecogn_SOURCES}) -# TARGET_LINK_LIBRARIES(${TESTSHAPE_RECOGN0} shaperecogn InterpKernelTestUtils medloader medcouplingcpp ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES} ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS} ${CBLAS_LIBRARIES}) TARGET_LINK_LIBRARIES(${TESTSHAPE_RECOGN0} shaperecogn InterpKernelTestUtils medloader medcouplingcpp ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS} ${CBLAS_LIBRARIES}) INSTALL(TARGETS ${TESTSHAPE_RECOGN0} DESTINATION ${MEDCOUPLING_INSTALL_BINS}) -- 2.39.2