products/patches/paraview.0010-ParaView_find_python.patch

   1 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
   2 --- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/99/FindPython/Support.cmake       2020-03-23 13:31:26.000000000 +0300
   3 +++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/99/FindPython/Support.cmake      2020-12-19 13:17:55.000000000 +0300
   4 @@ -1702,7 +1702,11 @@
   5                          NAMES_PER_DIR
   6                          HINTS ${_${_PYTHON_PREFIX}_HINTS}
   7                          PATHS ${_${_PYTHON_PREFIX}_VIRTUALENV_PATHS}
   8 -                        PATH_SUFFIXES bin)
   9 +                        PATH_SUFFIXES bin
  10 +                        NO_CMAKE_PATH
  11 +                        NO_CMAKE_ENVIRONMENT_PATH
  12 +                        NO_SYSTEM_ENVIRONMENT_PATH
  13 +                        NO_CMAKE_SYSTEM_PATH)
  14
  15            # Apple frameworks handling
  16            if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "LAST")
  17 @@ -1769,6 +1773,100 @@
  18              break()
  19            endif()
  20          endforeach()
  21 +
  22 +        foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
  23 +          # try to use pythonX.Y-config tool
  24 +          _python_get_names (_${_PYTHON_PREFIX}_CONFIG_NAMES VERSION ${_${_PYTHON_PREFIX}_VERSION} POSIX CONFIG)
  25 +
  26 +          # Framework Paths
  27 +          _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS ${_${_PYTHON_PREFIX}_VERSION})
  28 +
  29 +          # Apple frameworks handling
  30 +          if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "FIRST")
  31 +            find_program (_${_PYTHON_PREFIX}_CONFIG
  32 +                          NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
  33 +                          NAMES_PER_DIR
  34 +                          HINTS ${_${_PYTHON_PREFIX}_HINTS}
  35 +                          PATHS ${_${_PYTHON_PREFIX}_VIRTUALENV_PATHS}
  36 +                                ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
  37 +                          PATH_SUFFIXES bin
  38 +                          NO_CMAKE_PATH
  39 +                          NO_CMAKE_ENVIRONMENT_PATH
  40 +                          NO_SYSTEM_ENVIRONMENT_PATH
  41 +                          NO_CMAKE_SYSTEM_PATH)
  42 +          endif()
  43 +
  44 +          find_program (_${_PYTHON_PREFIX}_CONFIG
  45 +                        NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
  46 +                        NAMES_PER_DIR
  47 +                        HINTS ${_${_PYTHON_PREFIX}_HINTS}
  48 +                        PATHS ${_${_PYTHON_PREFIX}_VIRTUALENV_PATHS}
  49 +                        PATH_SUFFIXES bin)
  50 +
  51 +          # Apple frameworks handling
  52 +          if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "LAST")
  53 +            find_program (_${_PYTHON_PREFIX}_CONFIG
  54 +                          NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
  55 +                          NAMES_PER_DIR
  56 +                          PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
  57 +                          PATH_SUFFIXES bin
  58 +                          NO_DEFAULT_PATH)
  59 +          endif()
  60 +
  61 +          unset (_${_PYTHON_PREFIX}_CONFIG_NAMES)
  62 +
  63 +          if (_${_PYTHON_PREFIX}_CONFIG)
  64 +            execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --help
  65 +                             RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
  66 +                             OUTPUT_VARIABLE __${_PYTHON_PREFIX}_HELP
  67 +                             ERROR_QUIET
  68 +                             OUTPUT_STRIP_TRAILING_WHITESPACE)
  69 +            if (_${_PYTHON_PREFIX}_RESULT)
  70 +              # assume config tool is not usable
  71 +              unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
  72 +            endif()
  73 +          endif()
  74 +
  75 +          if (NOT _${_PYTHON_PREFIX}_CONFIG)
  76 +            continue()
  77 +          endif()
  78 +
  79 +          execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --abiflags
  80 +                           RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
  81 +                           OUTPUT_VARIABLE __${_PYTHON_PREFIX}_ABIFLAGS
  82 +                           ERROR_QUIET
  83 +                           OUTPUT_STRIP_TRAILING_WHITESPACE)
  84 +          if (_${_PYTHON_PREFIX}_RESULT)
  85 +            # assume ABI is not supported
  86 +            set (__${_PYTHON_PREFIX}_ABIFLAGS "")
  87 +          endif()
  88 +          if (DEFINED _${_PYTHON_PREFIX}_FIND_ABI AND NOT __${_PYTHON_PREFIX}_ABIFLAGS IN_LIST _${_PYTHON_PREFIX}_ABIFLAGS)
  89 +            # Wrong ABI
  90 +            unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
  91 +            continue()
  92 +          endif()
  93 +
  94 +          if (_${_PYTHON_PREFIX}_CONFIG AND DEFINED CMAKE_LIBRARY_ARCHITECTURE)
  95 +            # check that config tool match library architecture
  96 +            execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --configdir
  97 +                             RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
  98 +                             OUTPUT_VARIABLE _${_PYTHON_PREFIX}_CONFIGDIR
  99 +                             ERROR_QUIET
 100 +                             OUTPUT_STRIP_TRAILING_WHITESPACE)
 101 +            if (_${_PYTHON_PREFIX}_RESULT)
 102 +              unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
 103 +              continue()
 104 +            endif()
 105 +            string (FIND "${_${_PYTHON_PREFIX}_CONFIGDIR}" "${CMAKE_LIBRARY_ARCHITECTURE}" _${_PYTHON_PREFIX}_RESULT)
 106 +            if (_${_PYTHON_PREFIX}_RESULT EQUAL -1)
 107 +              unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
 108 +              continue()
 109 +            endif()
 110 +          endif()
 111 +          if (_${_PYTHON_PREFIX}_CONFIG)
 112 +            break()
 113 +          endif()
 114 +        endforeach()
 115        endif()
 116      endif()
 117    endif()
 118 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
 119 --- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/99/FindPython3.cmake      2020-03-23 13:31:26.000000000 +0300
 120 +++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/99/FindPython3.cmake     2020-12-19 13:18:50.000000000 +0300
 121 @@ -297,6 +297,7 @@
 122
 123  set (_Python3_REQUIRED_VERSION_MAJOR 3)
 124
 125 +set(Python3_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
 126  include (${CMAKE_CURRENT_LIST_DIR}/FindPython/Support.cmake)
 127
 128  if (COMMAND __Python3_add_library)