Commit 249fd506 authored by Andrew Maclean's avatar Andrew Maclean

Lots of minor changes for Examples to build with OpenGL2

Change-Id: I5eadbc3da480bb19db9b99f5c648ff1d3fe2316c
parent 2f4ed70c
......@@ -21,7 +21,7 @@ find_package(VTK COMPONENTS
vtkIOLegacy
vtkIOXML
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingCore
)
include(${VTK_USE_FILE})
......
......@@ -14,7 +14,7 @@ find_package(VTK COMPONENTS
vtkFiltersSources
vtkInteractionStyle
vtkRenderingLabel
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
cmake_minimum_required(VERSION 2.6.3 FATAL_ERROR)
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
if(POLICY CMP0020)
cmake_policy(SET CMP0020 NEW)
endif()
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # CMake 3.1
endif()
#
# Set the project name.
......
cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
if(POLICY CMP0020)
cmake_policy(SET CMP0020 NEW)
endif()
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
......@@ -29,7 +32,6 @@ else()
add_subdirectory(DataManipulation/Cxx)
add_subdirectory(ImageProcessing/Cxx)
add_subdirectory(IO/Cxx)
add_subdirectory(LIC/Cxx)
add_subdirectory(Medical/Cxx)
add_subdirectory(Modelling/Cxx)
add_subdirectory(MultiBlock/Cxx)
......@@ -44,6 +46,10 @@ else()
add_subdirectory(VolumeRendering/Cxx)
add_subdirectory(Widgets/Cxx)
add_subdirectory(ParallelProcessing/SMP)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
add_subdirectory(LIC/Cxx)
endif()
# if(vtkParallelCore_LOADED)
# add_subdirectory(ParallelProcessing/Generic)
# endif()
......
......@@ -13,7 +13,7 @@ find_package(VTK COMPONENTS
vtkCommonDataModel
vtkFiltersGeometry
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -5,6 +5,9 @@ endif()
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 NEW) # CMake 3.0
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # CMake 3.1
endif()
......
......@@ -5,6 +5,9 @@ endif()
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 NEW) # CMake 3.0
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # CMake 3.1
endif()
......
......@@ -5,6 +5,9 @@ endif()
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 NEW) # CMake 3.0
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # CMake 3.1
endif()
......@@ -14,7 +17,7 @@ find_package(VTK COMPONENTS
vtkGUISupportQt
vtkIOImage
vtkInteractionImage
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingCore
)
include(${VTK_USE_FILE})
......
......@@ -5,6 +5,9 @@ endif()
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 NEW) # CMake 3.0
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # CMake 3.1
endif()
......@@ -15,7 +18,7 @@ find_package(VTK COMPONENTS
vtkFiltersCore
vtkInfovisCore
vtkInteractionStyle
vtkRenderingFreeTypeOpenGL
vtkRenderingFreeType${VTK_RENDERING_BACKEND}
vtkViewsQt
)
include(${VTK_USE_FILE})
......
......@@ -12,7 +12,7 @@ find_package(VTK COMPONENTS
vtkIOImage
vtkImagingCore
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
......@@ -15,7 +15,7 @@ find_package(VTK COMPONENTS
vtkIOXML
vtkImagingStatistics
vtkInteractionStyle
vtkRenderingVolumeOpenGL
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtksys
)
......
......@@ -15,7 +15,7 @@ find_package(VTK COMPONENTS
vtkIOXML
vtkImagingHybrid
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
......@@ -14,7 +14,7 @@ find_package(VTK COMPONENTS
vtkFiltersSources
vtkIOXML
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingCore
vtksys
)
......
......@@ -16,7 +16,7 @@ find_package(VTK COMPONENTS
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -11,7 +11,7 @@ project (Step1)
find_package(VTK COMPONENTS
vtkFiltersSources
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -12,7 +12,7 @@ find_package(VTK COMPONENTS
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -11,7 +11,7 @@ project (Step3)
find_package(VTK COMPONENTS
vtkFiltersSources
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -11,7 +11,7 @@ project (Step4)
find_package(VTK COMPONENTS
vtkFiltersSources
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -12,7 +12,7 @@ find_package(VTK COMPONENTS
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -11,7 +11,7 @@ PROJECT (Step6)
find_package(VTK COMPONENTS
vtkFiltersSources
vtkInteractionWidgets
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -15,7 +15,7 @@ find_package(VTK COMPONENTS
vtkFiltersModeling
vtkIOXML
vtkInteractionStyle
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
......@@ -13,7 +13,7 @@ find_package(VTK COMPONENTS
vtkIOImage
vtkIOXML
vtkInteractionWidgets
vtkRenderingVolumeOpenGL
vtkRenderingVolume${VTK_RENDERING_BACKEND}
)
include(${VTK_USE_FILE})
......
......@@ -12,7 +12,7 @@ find_package(VTK COMPONENTS
vtkCommonCore
vtkFiltersSources
vtkInteractionWidgets
vtkRenderingOpenGL
vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment