From: Florian BRUNET Date: Mon, 18 Jan 2016 09:22:40 +0000 (+0100) Subject: Paraview 5.0 EDF delivery for Salome V8_0_BR. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffbt%2FPV50_delivery_V80BR;p=modules%2Fgui.git Paraview 5.0 EDF delivery for Salome V8_0_BR. --- diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index e52bb57b6..eb019716f 100755 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -38,7 +38,6 @@ SET(_adm_data FindSalomeSIP.cmake FindSalomeGUI.cmake FindSalomeOpenGL.cmake - FindSalomeParaView.cmake UsePyQt.cmake UseQtExt.cmake ) diff --git a/adm_local/cmake_files/FindSalomeParaView.cmake b/adm_local/cmake_files/FindSalomeParaView.cmake deleted file mode 100644 index 08c01ebc7..000000000 --- a/adm_local/cmake_files/FindSalomeParaView.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# 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})