X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMEDReader%2FIO%2FCMakeLists.txt;h=853c885c422e7a06710d1a7c7bde4c21ad4cd3e9;hb=467172fc03f8d730254bf304355fb76663bb33d0;hp=0ecbbbb9343f445d5515518110578c1c829b35c7;hpb=216b73d56a11d0b5f0ef26acfd85936f92c5f8ac;p=modules%2Fparavis.git diff --git a/src/Plugins/MEDReader/IO/CMakeLists.txt b/src/Plugins/MEDReader/IO/CMakeLists.txt index 0ecbbbb9..853c885c 100644 --- a/src/Plugins/MEDReader/IO/CMakeLists.txt +++ b/src/Plugins/MEDReader/IO/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2015 CEA/DEN, EDF R&D +# Copyright (C) 2010-2016 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 @@ -18,6 +18,7 @@ # INCLUDE_DIRECTORIES( + ${MEDCOUPLING_INCLUDE_DIRS} ${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${MED_ROOT_DIR}/include/salome @@ -27,7 +28,8 @@ IF(HDF5_IS_PARALLEL) ADD_DEFINITIONS("-DMEDREADER_USE_MPI") ENDIF(HDF5_IS_PARALLEL) -SET(MEDReader_CLASSES vtkMEDReader vtkExtractGroup vtkELNOMeshFilter vtkELNOSurfaceFilter vtkELNOFilter vtkExtractCellType) +SET(MEDReader_CLASSES vtkMEDReader vtkExtractGroup vtkELNOMeshFilter vtkELNOSurfaceFilter vtkELNOFilter + vtkExtractCellType vtkMEDQuadraturePointsGenerator) SET(MEDReader_SRCS) SET(MEDReader_HDRS) @@ -40,13 +42,13 @@ ENDFOREACH(class) ADD_LIBRARY(MEDLoaderForPV SHARED MEDFileFieldRepresentationTree.cxx MEDTimeReq.cxx MEDUtilities.cxx vtkGenerateVectors.cxx) IF(HDF5_IS_PARALLEL) - TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MED_paramedloader} ${MEDFILE_C_LIBRARIES}) + TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MEDCoupling_paramedloader} ${MEDFILE_C_LIBRARIES}) ELSE(HDF5_IS_PARALLEL) - TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MED_medloader} ${MEDFILE_C_LIBRARIES}) + TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MEDCoupling_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}) +TARGET_LINK_LIBRARIES(vtkMEDReader vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL ${PARAVIEW_LIBRARIES} MEDLoaderForPV ${MEDFILE_C_LIBRARIES}) INSTALL( TARGETS vtkMEDReader MEDLoaderForPV