diff options
| -rw-r--r-- | Modules/FindVTK.cmake | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Modules/FindVTK.cmake b/Modules/FindVTK.cmake index 4ce569c..0e4319e 100644 --- a/Modules/FindVTK.cmake +++ b/Modules/FindVTK.cmake @@ -6,12 +6,13 @@ # VTK_INSTALL_PATH - where is the installed version of VTK # VTK_BINARY_PATH - where is the binary tree (only defined if SOURCE_PATH is defined) # USE_INSTALLED_VTK - sould an installed or source version of VTK be used +# USE_VTK_FILE - the full path and location of the UseVTK.cmake file # # # Look for a binary tree # -FIND_PATH(VTK_BINARY_PATH vtkConfigure.h +FIND_PATH(VTK_BINARY_PATH UseVTK.cmake [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild] [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild2] [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild3] @@ -30,12 +31,10 @@ FIND_PATH(VTK_BINARY_PATH vtkConfigure.h IF (VTK_BINARY_PATH) SET (USE_INSTALLED_VTK 0 CACHE BOOL "Is an installed (versus source) version of VTK used") ELSE (VTK_BINARY_PATH) - # look for the vtk header files in installed places - FIND_PATH(VTK_INSTALL_PATH include/vtk/vtkObject.h + # look for installed path + FIND_PATH(VTK_INSTALL_PATH include/vtk/UseVTK.cmake /usr/local /usr - ) - FIND_PATH(VTK_INSTALL_PATH include/vtkObject.h [HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware\\VTK\\Nightly] ) IF (VTK_INSTALL_PATH) @@ -45,11 +44,9 @@ ENDIF (VTK_BINARY_PATH) IF (USE_INSTALLED_VTK) # look for the vtk header files in installed places - FIND_PATH(VTK_INSTALL_PATH include/vtk/vtkObject.h + FIND_PATH(VTK_INSTALL_PATH include/vtk/UseVTK.cmake /usr/local /usr - ) - FIND_PATH(VTK_INSTALL_PATH include/vtkObject.h [HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware\\VTK\\Nightly] ) IF (VTK_INSTALL_PATH) @@ -58,6 +55,15 @@ IF (USE_INSTALLED_VTK) ENDIF (USE_INSTALLED_VTK) +IF (USE_INSTALLED_VTK) + IF (VTK_INSTALL_PATH) + SET (USE_VTK_FILE ${VTK_INSTALL_PATH}/include/vtk/UseVTK.cmake) + ENDIF (VTK_INSTALL_PATH) +ELSE (USE_INSTALLED_VTK) + IF (VTK_BINARY_PATH) + SET (USE_VTK_FILE ${VTK_BINARY_PATH}/UseVTK.cmake) + ENDIF (VTK_BINARY_PATH) +ENDIF (USE_INSTALLED_VTK) |