view src/vtk-5-module-path.patch @ 4066:0962acdde3be

builld: allow out of source build * Makefile.in: add TOP_BUILD_DIR var and use TOP_DIR=srcdir, TOP_BUILD_DIR=builddir, modify paths to use TOP_DIR where needed * binary-dist-rules.mk: use TOP_DIR and TOP_BUILD_DIR where needed * makeinst-script.sh: use script path to determine TOPDIR, use TOPDIR where needed * src/default-octave.mk: install octave-version to builddir * src/stable-octave.mk: install octave-version to builddir * src/octave.mk: install octave-version to builddir * tools/set-mxe-env.sh.in: update fir builddir and srcdir use
author John Donoghue
date Wed, 23 Dec 2015 08:11:04 -0500
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})