ENH: Only search VTK_INSTALL_PATH if USE_INSTALLED_VTK is on. Only search VTK_BINARY_PATH if USE_BUILT_VTK is on.
This commit is contained in:
parent
e3f76e9367
commit
9f7d94a1c4
|
@ -46,13 +46,13 @@ IF(NOT VTK_DIR)
|
||||||
# Old scripts may set these directories in the CMakeCache.txt file.
|
# Old scripts may set these directories in the CMakeCache.txt file.
|
||||||
# They can tell us where to find VTKConfig.cmake.
|
# They can tell us where to find VTKConfig.cmake.
|
||||||
SET(VTK_DIR_SEARCH_LEGACY "")
|
SET(VTK_DIR_SEARCH_LEGACY "")
|
||||||
IF(VTK_BINARY_PATH)
|
IF(VTK_BINARY_PATH AND USE_BUILT_VTK)
|
||||||
SET(VTK_DIR_SEARCH_LEGACY ${VTK_DIR_SEARCH_LEGACY} ${VTK_BINARY_PATH})
|
SET(VTK_DIR_SEARCH_LEGACY ${VTK_DIR_SEARCH_LEGACY} ${VTK_BINARY_PATH})
|
||||||
ENDIF(VTK_BINARY_PATH)
|
ENDIF(VTK_BINARY_PATH AND USE_BUILT_VTK)
|
||||||
IF(VTK_INSTALL_PATH)
|
IF(VTK_INSTALL_PATH AND USE_INSTALLED_VTK)
|
||||||
SET(VTK_DIR_SEARCH_LEGACY ${VTK_DIR_SEARCH_LEGACY}
|
SET(VTK_DIR_SEARCH_LEGACY ${VTK_DIR_SEARCH_LEGACY}
|
||||||
${VTK_INSTALL_PATH}/lib/vtk)
|
${VTK_INSTALL_PATH}/lib/vtk)
|
||||||
ENDIF(VTK_INSTALL_PATH)
|
ENDIF(VTK_INSTALL_PATH AND USE_INSTALLED_VTK)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Look for an installation or build tree.
|
# Look for an installation or build tree.
|
||||||
|
|
Loading…
Reference in New Issue