From: nghodban <Nabil.Ghodbane@c-s.fr>
Date: Sun, 20 Dec 2020 14:07:31 +0000 (+0100)
Subject: bos #18911 [CEA] FD30 (VM) - GUI compilation
X-Git-Tag: V9_7_0~182
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=108cc82ec9d9c2da9172c3749d59ba1f02d8fb9d;p=tools%2Fsat_salome.git

bos #18911 [CEA] FD30 (VM) - GUI compilation
---

diff --git a/products/patches/paraview.0010-ParaView_find_python.patch b/products/patches/paraview.0010-ParaView_find_python.patch
new file mode 100644
index 0000000..f95058f
--- /dev/null
+++ b/products/patches/paraview.0010-ParaView_find_python.patch
@@ -0,0 +1,128 @@
+diff -Naur ParaView-5.8.0_SRC_orig/VTK/CMake/patches/99/FindPython/Support.cmake ParaView-5.8.0_SRC_modif/VTK/CMake/patches/99/FindPython/Support.cmake
+--- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/99/FindPython/Support.cmake	2020-03-23 13:31:26.000000000 +0300
++++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/99/FindPython/Support.cmake	2020-12-19 13:17:55.000000000 +0300
+@@ -1702,7 +1702,11 @@
+                         NAMES_PER_DIR
+                         HINTS ${_${_PYTHON_PREFIX}_HINTS}
+                         PATHS ${_${_PYTHON_PREFIX}_VIRTUALENV_PATHS}
+-                        PATH_SUFFIXES bin)
++                        PATH_SUFFIXES bin
++                        NO_CMAKE_PATH
++                        NO_CMAKE_ENVIRONMENT_PATH
++                        NO_SYSTEM_ENVIRONMENT_PATH
++                        NO_CMAKE_SYSTEM_PATH)
+ 
+           # Apple frameworks handling
+           if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "LAST")
+@@ -1769,6 +1773,100 @@
+             break()
+           endif()
+         endforeach()
++
++        foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
++          # try to use pythonX.Y-config tool
++          _python_get_names (_${_PYTHON_PREFIX}_CONFIG_NAMES VERSION ${_${_PYTHON_PREFIX}_VERSION} POSIX CONFIG)
++
++          # Framework Paths
++          _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS ${_${_PYTHON_PREFIX}_VERSION})
++
++          # Apple frameworks handling
++          if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "FIRST")
++            find_program (_${_PYTHON_PREFIX}_CONFIG
++                          NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
++                          NAMES_PER_DIR
++                          HINTS ${_${_PYTHON_PREFIX}_HINTS}
++                          PATHS ${_${_PYTHON_PREFIX}_VIRTUALENV_PATHS}
++                                ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
++                          PATH_SUFFIXES bin
++                          NO_CMAKE_PATH
++                          NO_CMAKE_ENVIRONMENT_PATH
++                          NO_SYSTEM_ENVIRONMENT_PATH
++                          NO_CMAKE_SYSTEM_PATH)
++          endif()
++
++          find_program (_${_PYTHON_PREFIX}_CONFIG
++                        NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
++                        NAMES_PER_DIR
++                        HINTS ${_${_PYTHON_PREFIX}_HINTS}
++                        PATHS ${_${_PYTHON_PREFIX}_VIRTUALENV_PATHS}
++                        PATH_SUFFIXES bin)
++
++          # Apple frameworks handling
++          if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "LAST")
++            find_program (_${_PYTHON_PREFIX}_CONFIG
++                          NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
++                          NAMES_PER_DIR
++                          PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
++                          PATH_SUFFIXES bin
++                          NO_DEFAULT_PATH)
++          endif()
++
++          unset (_${_PYTHON_PREFIX}_CONFIG_NAMES)
++
++          if (_${_PYTHON_PREFIX}_CONFIG)
++            execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --help
++                             RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
++                             OUTPUT_VARIABLE __${_PYTHON_PREFIX}_HELP
++                             ERROR_QUIET
++                             OUTPUT_STRIP_TRAILING_WHITESPACE)
++            if (_${_PYTHON_PREFIX}_RESULT)
++              # assume config tool is not usable
++              unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
++            endif()
++          endif()
++
++          if (NOT _${_PYTHON_PREFIX}_CONFIG)
++            continue()
++          endif()
++
++          execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --abiflags
++                           RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
++                           OUTPUT_VARIABLE __${_PYTHON_PREFIX}_ABIFLAGS
++                           ERROR_QUIET
++                           OUTPUT_STRIP_TRAILING_WHITESPACE)
++          if (_${_PYTHON_PREFIX}_RESULT)
++            # assume ABI is not supported
++            set (__${_PYTHON_PREFIX}_ABIFLAGS "")
++          endif()
++          if (DEFINED _${_PYTHON_PREFIX}_FIND_ABI AND NOT __${_PYTHON_PREFIX}_ABIFLAGS IN_LIST _${_PYTHON_PREFIX}_ABIFLAGS)
++            # Wrong ABI
++            unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
++            continue()
++          endif()
++
++          if (_${_PYTHON_PREFIX}_CONFIG AND DEFINED CMAKE_LIBRARY_ARCHITECTURE)
++            # check that config tool match library architecture
++            execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --configdir
++                             RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
++                             OUTPUT_VARIABLE _${_PYTHON_PREFIX}_CONFIGDIR
++                             ERROR_QUIET
++                             OUTPUT_STRIP_TRAILING_WHITESPACE)
++            if (_${_PYTHON_PREFIX}_RESULT)
++              unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
++              continue()
++            endif()
++            string (FIND "${_${_PYTHON_PREFIX}_CONFIGDIR}" "${CMAKE_LIBRARY_ARCHITECTURE}" _${_PYTHON_PREFIX}_RESULT)
++            if (_${_PYTHON_PREFIX}_RESULT EQUAL -1)
++              unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
++              continue()
++            endif()
++          endif()
++          if (_${_PYTHON_PREFIX}_CONFIG)
++            break()
++          endif()
++        endforeach()
+       endif()
+     endif()
+   endif()
+diff -Naur ParaView-5.8.0_SRC_orig/VTK/CMake/patches/99/FindPython3.cmake ParaView-5.8.0_SRC_modif/VTK/CMake/patches/99/FindPython3.cmake
+--- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/99/FindPython3.cmake	2020-03-23 13:31:26.000000000 +0300
++++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/99/FindPython3.cmake	2020-12-19 13:18:50.000000000 +0300
+@@ -297,6 +297,7 @@
+ 
+ set (_Python3_REQUIRED_VERSION_MAJOR 3)
+ 
++set(Python3_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
+ include (${CMAKE_CURRENT_LIST_DIR}/FindPython/Support.cmake)
+ 
+ if (COMMAND __Python3_add_library)