blob: c241e139eaba3314f19fb078b82ba7287b0dcda2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
diff -ru visit2.7.1.old/src/CMake/FindVisItVTK.cmake visit2.7.1.new/src/CMake/FindVisItVTK.cmake
--- visit2.7.1.old/src/CMake/FindVisItVTK.cmake 2013-09-13 21:06:57.000000000 +0200
+++ visit2.7.1.new/src/CMake/FindVisItVTK.cmake 2014-01-25 20:30:06.948654123 +0100
@@ -234,11 +234,17 @@
# check for python wrappers
IF (NOT WIN32)
- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
+ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/)
ELSE (NOT WIN32)
- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
+ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib)
ENDIF (NOT WIN32)
-MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
+MESSAGE(STATUS " VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}")
+
+FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES})
+ IF(EXISTS "${X}/site-packages/vtk")
+ SET(VTK_PY_WRAPPERS_DIR "${X}")
+ ENDIF()
+ENDFOREACH(X)
IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
|
GitWeb
