summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2002-11-20 19:11:07 (GMT)
committerBrad King <brad.king@kitware.com>2002-11-20 19:11:07 (GMT)
commit9f7d94a1c4fb5d718086b464624e5bebf5a8aa82 (patch)
tree74debc013ef198b582cead90b7b407366503ccfc
parente3f76e93670ff7d3ee6b980a8e10fa34820710c0 (diff)
downloadCMake-9f7d94a1c4fb5d718086b464624e5bebf5a8aa82.zip
CMake-9f7d94a1c4fb5d718086b464624e5bebf5a8aa82.tar.gz
CMake-9f7d94a1c4fb5d718086b464624e5bebf5a8aa82.tar.bz2
ENH: Only search VTK_INSTALL_PATH if USE_INSTALLED_VTK is on. Only search VTK_BINARY_PATH if USE_BUILT_VTK is on.
-rw-r--r--Modules/FindVTK.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindVTK.cmake b/Modules/FindVTK.cmake
index f54feef..e39bd1b 100644
--- a/Modules/FindVTK.cmake
+++ b/Modules/FindVTK.cmake
@@ -46,13 +46,13 @@ IF(NOT VTK_DIR)
# Old scripts may set these directories in the CMakeCache.txt file.
# They can tell us where to find VTKConfig.cmake.
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})
- ENDIF(VTK_BINARY_PATH)
- IF(VTK_INSTALL_PATH)
+ ENDIF(VTK_BINARY_PATH AND USE_BUILT_VTK)
+ IF(VTK_INSTALL_PATH AND USE_INSTALLED_VTK)
SET(VTK_DIR_SEARCH_LEGACY ${VTK_DIR_SEARCH_LEGACY}
${VTK_INSTALL_PATH}/lib/vtk)
- ENDIF(VTK_INSTALL_PATH)
+ ENDIF(VTK_INSTALL_PATH AND USE_INSTALLED_VTK)
#
# Look for an installation or build tree.