From 9f7d94a1c4fb5d718086b464624e5bebf5a8aa82 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 20 Nov 2002 14:11:07 -0500 Subject: [PATCH] ENH: Only search VTK_INSTALL_PATH if USE_INSTALLED_VTK is on. Only search VTK_BINARY_PATH if USE_BUILT_VTK is on. --- Modules/FindVTK.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/FindVTK.cmake b/Modules/FindVTK.cmake index f54feef6a7..e39bd1bd95 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.