Mercurial > mxe-octave

view src/vtk-5-module-path.patch @ 4472:0fdeee4cfe11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: enable Qt terminal and set default to wxt * src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin, install gnuplot_qt.exe * src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths * installer-files/octave-firsttime.vbs: set GNUTERM=wxt * installer-files/octave.vbs: set GNUTERM=wxt * installer-files/octave.bat: set GNUTERM=wxt * installer-files/cmdshell.bat: set GNUTERM=wxt
author Mike Miller <mtmiller@octave.org>
date Wed, 06 Sep 2017 16:19:37 -0700
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})