diff --git a/arcane/cmake/Modules/FindvtkIOLegacy.cmake b/arcane/cmake/Modules/FindvtkIOLegacy.cmake new file mode 100644 index 0000000000..9909964826 --- /dev/null +++ b/arcane/cmake/Modules/FindvtkIOLegacy.cmake @@ -0,0 +1,29 @@ +# VTK peut se trouver soit directement, soit via Paraview. +# Pour Arcane, vtkIOLegacy est utilisé pour la lecture des maillages polyédriques +# Voir fichier 'FindvtkIOXML' pour plus d'infos +arccon_return_if_package_found(vtkIOLegacy) + +find_package(ParaView QUIET) +find_package(VTK QUIET COMPONENTS vtkIOLegacy) + +if (VTK_FOUND) + message(STATUS "VTK (for vtkIOLegacy) version ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}") +endif() + +if(TARGET vtkIOLegacy) + set(vtkIOLegacy_FOUND TRUE) + message(STATUS "vtkIOLegacy_INCLUDE_DIRS = ${vtkIOLegacy_INCLUDE_DIRS}") + arcane_vtkutils_add_depend_lib_to_list(vtkIOLegacy) + message(STATUS "vtkIOLegacy LIBS=${_ALLLIBS}") + set(vtkIOLegacy_LIBRARIES "${_ALLLIBS}") + arccon_register_package_library(vtkIOLegacy vtkIOLegacy) + # Pour compatibilité avec l'existant (septembre 2022) + add_library(arcane::vtkIOLegacy ALIAS arcconpkg_vtkIOLegacy) +endif() + +# ---------------------------------------------------------------------------- +# Local Variables: +# tab-width: 2 +# indent-tabs-mode: nil +# coding: utf-8-with-signature +# End: \ No newline at end of file diff --git a/arcane/src/arcane/std/CMakeLists.txt b/arcane/src/arcane/std/CMakeLists.txt index 44b511df42..dc5d077eca 100644 --- a/arcane/src/arcane/std/CMakeLists.txt +++ b/arcane/src/arcane/std/CMakeLists.txt @@ -1,5 +1,5 @@ -set(PRIVATE_PKGS LibUnwind Papi Parmetis PTScotch Udunits Zoltan BZip2 LZ4 Otf2 DbgHelp HWLoc Hiredis) -set(PUBLIC_PKGS HDF5 MPI) +set(PRIVATE_PKGS LibUnwind Papi Parmetis PTScotch Udunits Zoltan BZip2 LZ4 Otf2 DbgHelp HWLoc Hiredis) +set(PUBLIC_PKGS HDF5 MPI vtkIOXML vtkIOLegacy) set(PKGS ${PRIVATE_PKGS} ${PUBLIC_PKGS}) foreach(package ${PKGS}) @@ -145,11 +145,10 @@ if(ARCANE_HAS_LINUX_PERF_COUNTERS) ) endif() -if(vtkIOXML_FOUND) +if(vtkIOXML_FOUND AND vtkIOLegacy_FOUND) list(APPEND ARCANE_SOURCES VtkPolyhedralMeshIOService.cc ) - list(APPEND PRIVATE_PKGS vtkIOXML) endif() if (ARCANE_HAS_KDI_PYTHON) diff --git a/arcane/src/arcane/tests/CMakeLists.txt b/arcane/src/arcane/tests/CMakeLists.txt index 2f40d25331..b4e75c0879 100644 --- a/arcane/src/arcane/tests/CMakeLists.txt +++ b/arcane/src/arcane/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -set(TEST_DIRS . anyitem dof inout) +set(TEST_DIRS . anyitem dof inout) set(TEST_LIBS ${ARCANE_ADDITIONNAL_TEST_LIBRARIES}) if(MPI_FOUND AND NOT WIN32) @@ -560,7 +560,7 @@ if(HDF5_FOUND) endif() if(vtkIOXML_FOUND) ARCANE_ADD_TEST_SEQUENTIAL(vtk_vtu testMesh-format_vtu.arc) - if (Neo_FOUND) + if (vtkIO_Legacy AND Neo_FOUND) arcane_add_test_sequential(polyhedral_vtk1 testMeshPolyhedral-1.arc) arcane_add_test_sequential(polyhedral_vtk2 testMeshPolyhedral-2.arc) arcane_add_test_sequential(polyhedral_vtk3 testMeshPolyhedral-3.arc)