diff options
| -rw-r--r-- | Modules/FindVTK.cmake | 3 | ||||
| -rw-r--r-- | Modules/UseVTKIncludes.cmake | 25 | ||||
| -rw-r--r-- | Modules/UseVTKLibraries.cmake | 25 |
3 files changed, 3 insertions, 50 deletions
diff --git a/Modules/FindVTK.cmake b/Modules/FindVTK.cmake index a026f63..bdba013 100644 --- a/Modules/FindVTK.cmake +++ b/Modules/FindVTK.cmake @@ -22,6 +22,7 @@ FIND_PATH(VTK_SOURCE_PATH Common/vtkObject.h [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereSource4] ../VTK VTK + $ENV{HOME}/VTK ) # @@ -41,6 +42,8 @@ IF (VTK_SOURCE_PATH) ../vtkbin VTKBIN vtkbin + $ENV{HOME}/VTKBIN + $ENV{HOME}/vtkbin ) ELSE (VTK_SOURCE_PATH) # look for the vtk header files in installed places diff --git a/Modules/UseVTKIncludes.cmake b/Modules/UseVTKIncludes.cmake deleted file mode 100644 index 82250ce..0000000 --- a/Modules/UseVTKIncludes.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# -# This module add the VTK include paths to a project -# It should be included after the FindVTK module -# -IF (USE_INSTALLED_VTK) - IF (VTK_INSTALL_PATH) - INCLUDE_DIRECTORIES ( ${VTK_INSTALL_PATH}/include ${VTK_INSTALL_PATH}/include/vtk ) - ENDIF (VTK_INSTALL_PATH) -ELSE (USE_INSTALLED_VTK) - IF (VTK_SOURCE_PATH) - INCLUDE_DIRECTORIES( - ${VTK_SOURCE_PATH}/Common - ${VTK_SOURCE_PATH}/Filtering - ${VTK_SOURCE_PATH}/IO - ${VTK_SOURCE_PATH}/Graphics - ${VTK_SOURCE_PATH}/Imaging - ${VTK_SOURCE_PATH}/Rendering - ${VTK_SOURCE_PATH}/Hybrid - ${VTK_SOURCE_PATH}/Patented - ${VTK_SOURCE_PATH}/Parallel) - ENDIF (VTK_SOURCE_PATH) - IF (VTK_BIN_PATH) - INCLUDE_DIRECTORIES( ${VTK_BIN_PATH) ) - ENDIF (VTK_BIN_PATH) -ENDIF (USE_INSTALLED_VTK) diff --git a/Modules/UseVTKLibraries.cmake b/Modules/UseVTKLibraries.cmake deleted file mode 100644 index 89f801f..0000000 --- a/Modules/UseVTKLibraries.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# -# This module add the VTK include paths to a project -# It should be included after the FindVTK module -# -IF (USE_INSTALLED_VTK) - IF (VTK_INSTALL_PATH) - LINK_DIRECTORIES ( ${VTK_INSTALL_PATH}/lib ) - ENDIF (VTK_INSTALL_PATH) -ELSE (USE_INSTALLED_VTK) - IF (VTK_SOURCE_PATH) - INCLUDE_DIRECTORIES( - ${VTK_SOURCE_PATH}/Common - ${VTK_SOURCE_PATH}/Filtering - ${VTK_SOURCE_PATH}/IO - ${VTK_SOURCE_PATH}/Graphics - ${VTK_SOURCE_PATH}/Imaging - ${VTK_SOURCE_PATH}/Rendering - ${VTK_SOURCE_PATH}/Hybrid - ${VTK_SOURCE_PATH}/Patented - ${VTK_SOURCE_PATH}/Parallel) - ENDIF (VTK_SOURCE_PATH) - IF (VTK_BIN_PATH) - INCLUDE_DIRECTORIES( ${VTK_BIN_PATH) ) - ENDIF (VTK_BIN_PATH) -ENDIF (USE_INSTALLED_VTK) |