From 92f1f71f94c06819402acb95dc09c818097049d9 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 10 Oct 2013 12:40:40 +0000 Subject: [PATCH] Move VTK cmake configuration file from GUI module to the KERNEL: it is used in GEOM WITHOUT GUI, SMESH WITHOUT GUI, ... configurations. --- salome_adm/cmake_files/CMakeLists.txt | 5 +- salome_adm/cmake_files/FindSalomeVTK.cmake | 60 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 salome_adm/cmake_files/FindSalomeVTK.cmake diff --git a/salome_adm/cmake_files/CMakeLists.txt b/salome_adm/cmake_files/CMakeLists.txt index 3ae3bf234..7cd6517f9 100755 --- a/salome_adm/cmake_files/CMakeLists.txt +++ b/salome_adm/cmake_files/CMakeLists.txt @@ -48,12 +48,13 @@ SET(DATA FindSalomePython.cmake FindSalomeSphinx.cmake FindSalomeSWIG.cmake - FindSphinx.cmake + FindSphinx.cmake + FindSalomeVTK.cmake FindMEDFile.cmake InstallAndCompilePythonFile.cmake UseOmniORB.cmake SalomeMacros.cmake - SalomeSetupPlatform.cmake + SalomeSetupPlatform.cmake ) INSTALL(FILES ${DATA} DESTINATION ${SALOME_INSTALL_CMAKE}) diff --git a/salome_adm/cmake_files/FindSalomeVTK.cmake b/salome_adm/cmake_files/FindSalomeVTK.cmake new file mode 100644 index 000000000..b2fa8d12b --- /dev/null +++ b/salome_adm/cmake_files/FindSalomeVTK.cmake @@ -0,0 +1,60 @@ +# Copyright (C) 2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# Author: Adrien Bruneton +# + +# VTK detection for Salome (see http://www.vtk.org/Wiki/VTK/Build_System_Migration) +# +# !! Please read the generic detection procedure in SalomeMacros.cmake !! +# + +# List the required components: +# Seting the following variable is equivalent to having passed the components +# when calling the FIND_PACKAGE() command. +SET(SalomeVTK_FIND_COMPONENTS + vtkRenderingFreeTypeOpenGL + vtkRenderingLOD + vtkRenderingAnnotation + vtkFiltersParallel + vtkIOExport + #vtkWrappingPythonCore ## ParaView 4.0.1 + vtkWrappingPython + vtkIOXML + vtkFiltersVerdict +) + +# If no VTK root dir is specified, try the ParaView root dir: +SET(PARAVIEW_ROOT_DIR "$ENV{PARAVIEW_ROOT_DIR}" CACHE PATH "Path to the ParaView installation") +IF(EXISTS "${PARAVIEW_ROOT_DIR}" AND (NOT VTK_ROOT_DIR)) + MESSAGE(STATUS "Looking for VTK in the ParaView installation (PARAVIEW_ROOT_DIR exists and VTK_ROOT_DIR is not defined) ...") + + # Extract sub-directory "paraview-x.xx": + FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-*") + MESSAGE(STATUS "Setting VTK_DIR to: ${VTK_DIR}") +ENDIF() + +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(VTK VTK_INCLUDE_DIRS 2) +MARK_AS_ADVANCED(VTK_DIR) + +SALOME_ACCUMULATE_HEADERS(VTK_INCLUDE_DIRS) + +IF(VTK_FOUND) + MESSAGE(STATUS "VTK version is ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}") + #MESSAGE(STATUS "VTK libraries are: ${VTK_LIBRARIES}") +ENDIF() -- 2.39.2