view src/vtk-5-module-path.patch @ 5531:eae508c12529

Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +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})