From 0d0dd3332e3a0fc0cc3c1b28ae58ece15f921a32 Mon Sep 17 00:00:00 2001 From: Florian BRUNET Date: Mon, 18 Jan 2016 10:21:34 +0100 Subject: [PATCH] Paraview 5.0 EDF delivery for Salome V8_0_BR. --- salome_adm/cmake_files/CMakeLists.txt | 1 + .../cmake_files/FindSalomeParaView.cmake | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 salome_adm/cmake_files/FindSalomeParaView.cmake diff --git a/salome_adm/cmake_files/CMakeLists.txt b/salome_adm/cmake_files/CMakeLists.txt index ed3f36a3d..5d7380685 100755 --- a/salome_adm/cmake_files/CMakeLists.txt +++ b/salome_adm/cmake_files/CMakeLists.txt @@ -44,6 +44,7 @@ SET(DATA FindSalomeMPI.cmake FindSalomeOmniORB.cmake FindSalomeOmniORBPy.cmake + FindSalomeParaView.cmake FindSalomePThread.cmake FindSalomePython.cmake FindSalomeSphinx.cmake diff --git a/salome_adm/cmake_files/FindSalomeParaView.cmake b/salome_adm/cmake_files/FindSalomeParaView.cmake new file mode 100644 index 000000000..08c01ebc7 --- /dev/null +++ b/salome_adm/cmake_files/FindSalomeParaView.cmake @@ -0,0 +1,39 @@ +# Copyright (C) 2010-2015 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, or (at your option) any later version. +# +# 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 +# + +# ParaView detection for salome +# +# !! Please read the generic detection procedure in SalomeMacros.cmake !! +# + +IF(NOT QT_VERSION) + MESSAGE(FATAL_ERROR "Detection of ParaView requires Qt to be detected first!") +ENDIF() + +IF (QT_VERSION VERSION_LESS "5.0") + SET(PARAVIEW_QT_VERSION "4") +ELSE() + SET(PARAVIEW_QT_VERSION "5") +ENDIF() + +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParaView PARAVIEW_USE_FILE 4) + +INCLUDE(${PARAVIEW_USE_FILE}) -- 2.39.2