From fab8f9c72435aaef019cb312767b84974aee9b26 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Mon, 6 Oct 2014 10:04:48 +0200 Subject: [PATCH] Last cleanup to compile // plugins withtout trouble. --- src/Plugins/MEDReader/IO/CMakeLists.txt | 11 ++++++++--- src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt | 12 ++++++------ src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt | 4 +--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/Plugins/MEDReader/IO/CMakeLists.txt b/src/Plugins/MEDReader/IO/CMakeLists.txt index ce8030ae..05e7d5f8 100644 --- a/src/Plugins/MEDReader/IO/CMakeLists.txt +++ b/src/Plugins/MEDReader/IO/CMakeLists.txt @@ -23,9 +23,9 @@ INCLUDE_DIRECTORIES( ${MED_ROOT_DIR}/include/salome ) -IF(PARAVIEW_USE_MPI) +IF(HDF5_IS_PARALLEL) ADD_DEFINITIONS("-DMEDREADER_USE_MPI") -ENDIF(PARAVIEW_USE_MPI) +ENDIF(HDF5_IS_PARALLEL) SET(MEDReader_CLASSES vtkMEDReader vtkExtractGroup vtkELNOMeshFilter vtkELNOSurfaceFilter vtkELNOFilter vtkExtractCellType) @@ -38,7 +38,12 @@ FOREACH(class ${MEDReader_CLASSES}) ENDFOREACH(class) ADD_LIBRARY(MEDLoaderForPV SHARED MEDFileFieldRepresentationTree.cxx MEDTimeReq.cxx MEDUtilities.cxx vtkGenerateVectors.cxx) -TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MED_medloader} ${MEDFILE_C_LIBRARIES}) + +IF(HDF5_IS_PARALLEL) + TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MED_paramedloader} ${MEDFILE_C_LIBRARIES}) +ELSE(HDF5_IS_PARALLEL) + TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MED_medloader} ${MEDFILE_C_LIBRARIES}) +ENDIF(HDF5_IS_PARALLEL) VTK_MODULE_LIBRARY(vtkMEDReader ${MEDReader_SRCS}) TARGET_LINK_LIBRARIES(vtkMEDReader vtkPVVTKExtensionsRendering vtkRenderingFreeType vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersCore vtkFiltersGeneral MEDLoaderForPV ${MEDFILE_C_LIBRARIES}) diff --git a/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt b/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt index bbdb625b..90cba22d 100644 --- a/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt +++ b/src/Plugins/MEDReader/IO/Testing/Cxx/CMakeLists.txt @@ -48,12 +48,12 @@ TARGET_LINK_LIBRARIES(TestReading0 MEDLoaderForPV vtkCommonDataModel) #ADD_EXECUTABLE(TestMedReadDescendingPolyhedron ${TestMedReadDescendingPolyhedron_SRCS}) #ADD_EXECUTABLE(TestMedWriteOcta12 ${TestMedWriteOcta12_SRCS}) -IF(${HDF5_IS_PARALLEL}) - ADD_EXECUTABLE(TestMedParallelRead ${TestMedParallelRead_SRCS}) - ADD_EXECUTABLE(TestMedParallelWrite ${TestMedParallelWrite_SRCS}) - TARGET_LINK_LIBRARIES(TestMedParallelRead vtkParallelCore ${MED_LIBRARIES}) - TARGET_LINK_LIBRARIES(TestMedParallelWrite vtkParallelCore ${MED_LIBRARIES}) -ENDIF(${HDF5_IS_PARALLEL}) +#IF(${HDF5_IS_PARALLEL}) +# ADD_EXECUTABLE(TestMedParallelRead ${TestMedParallelRead_SRCS}) +# ADD_EXECUTABLE(TestMedParallelWrite ${TestMedParallelWrite_SRCS}) +# TARGET_LINK_LIBRARIES(TestMedParallelRead vtkParallelCore ${MED_LIBRARIES}) +# TARGET_LINK_LIBRARIES(TestMedParallelWrite vtkParallelCore ${MED_LIBRARIES}) +#ENDIF(${HDF5_IS_PARALLEL}) INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../../module.cmake) diff --git a/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt b/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt index 00fb41be..1ed9e77d 100644 --- a/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt +++ b/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt @@ -17,9 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE_DIRECTORIES( - ${PROJECT_SOURCE_DIR}/IO - ${PROJECT_SOURCE_DIR}/IO ) +INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/IO ) IF(PARAVIEW_BUILD_QT_GUI) -- 2.39.2