view src/vtk-5-module-path.patch @ 5499:be0a7ce498e6

Update mesa to version 20.0.8 (bug #58689). * src/mesa.mk: Update version and checksum. Add build-meson to dependecies. Update build rule to use meson and ninja as the build tools. * src/mesa-1-meson.patch: Add new patch. * src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer needed. * dist-files.mk: Update file list. * src/build-mako.mk: Depend on and use python3. * src/build-markupsafe.mk: Depend on and use python3.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 20:58:57 +0200
parents 99516e73b368
children
line wrap: on
line source

# This file is part of MXE.
# See index.html for further information.

This patch has been taken from:

http://www.vtk.org/Bug/view.php?id=12746

diff -r 39846999f521 CMake/vtkThirdParty.cmake
--- a/CMake/vtkThirdParty.cmake	Wed Nov 23 19:06:30 2011 +1100
+++ b/CMake/vtkThirdParty.cmake	Wed Nov 23 19:10:41 2011 +1100
@@ -3,11 +3,11 @@
   OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
   MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
   IF(VTK_USE_SYSTEM_${upper})
-    IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
-      INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
-    ELSE(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
-      INCLUDE(${VTK_CMAKE_DIR}/Find${upper}.cmake)
-    ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
+    IF(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
+      INCLUDE(${VTK_CMAKE_DIR}/Find${upper}.cmake)
+    ELSE(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
+      INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
+    ENDIF(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
     MARK_AS_ADVANCED(${upper}_INCLUDE_DIR ${upper}_LIBRARY)
     IF(${upper}_FOUND)
       SET(VTK_${upper}_LIBRARIES ${${upper}_LIBRARIES})