From a138d1f2a2c4cacb0fe3b53ef01ea37670514987 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 11 Nov 2016 15:08:20 +0100 Subject: [PATCH] add missing vtk component, use VTK_INCLUDE_DIRS for include dirs --- CMakeLists.txt | 2 +- src/3rdParty/salomesmesh/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ede2e663d..e33abb877 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -566,7 +566,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Salome SMESH sources are under src/3rdParty now IF(BUILD_SMESH) #if we use smesh we definitly also need vtk, no matter of external or internal smesh - find_package(VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkFiltersVerdict vtkIOXML vtkFiltersCore vtkFiltersGeneral vtkIOLegacy vtkFiltersExtraction vtkFiltersSources vtkFiltersGeometry REQUIRED) #don't check VERSION 6 as this would exclude version 7 + find_package(VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkFiltersVerdict vtkIOXML vtkFiltersCore vtkFiltersGeneral vtkIOLegacy vtkFiltersExtraction vtkFiltersSources vtkFiltersGeometry vtkParallelMPI REQUIRED) #don't check VERSION 6 as this would exclude version 7 set(BUILD_FEM_VTK ON) if(${VTK_MAJOR_VERSION} LESS 6) message( FATAL_ERROR "Found VTK version is <6, this is not compatible" ) diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 8e682fb2e..bee55100f 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -37,7 +37,7 @@ include_directories( ${NGLIB_INCLUDE_DIR} ${NETGEN_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${VTK_INCLUDE_DIR} + ${VTK_INCLUDE_DIRS} ${HDF5_INCLUDE_DIR} ${MEDFILE_INCLUDE_DIRS} ${BOOST_INCLUDE_DIR}