diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/vtk-5-module-path.patch | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/vtk-5-module-path.patch')
| -rw-r--r-- | src/vtk-5-module-path.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/vtk-5-module-path.patch b/src/vtk-5-module-path.patch new file mode 100644 index 0000000..9f60bc0 --- /dev/null +++ b/src/vtk-5-module-path.patch @@ -0,0 +1,27 @@ +# 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}) |