suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing vtk component, use VTK_INCLUDE_DIRS for include dirs

Browse Source
This commit is contained in:
wmayer 2016-11-11 15:08:20 +01:00
parent ebfba0b863
commit a138d1f2a2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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" )

2
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@ -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}