Commit 962c841b authored by Adam Borowski's avatar Adam Borowski

Missing parts of Andreas Beckmann's last upload.

parent 0f2c14c3
...@@ -135,11 +135,12 @@ IF(Shell:CL) ...@@ -135,11 +135,12 @@ IF(Shell:CL)
ENDIF(Shell:CL) ENDIF(Shell:CL)
# Find VTK # Find VTK
SET(VTK_DIR $ENV{VTKDIR}) #SET(VTK_DIR $ENV{VTKDIR})
INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake) #INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
IF(NOT VTK_FOUND) #IF(NOT VTK_FOUND)
MESSAGE(FATAL_ERROR "VTK is not found. Please check that VTKDIR variables is set properly.") # MESSAGE(FATAL_ERROR "VTK is not found. Please check that VTKDIR variables is set properly.")
ENDIF(NOT VTK_FOUND) #ENDIF(NOT VTK_FOUND)
find_package(VTK)
INCLUDE(${VTK_USE_FILE}) INCLUDE(${VTK_USE_FILE})
IF(VTK_USE_VOLUMEPRO AND VTK_HAVE_VP1000) IF(VTK_USE_VOLUMEPRO AND VTK_HAVE_VP1000)
...@@ -237,14 +238,14 @@ IF(CustomVP1000) ...@@ -237,14 +238,14 @@ IF(CustomVP1000)
ADD_DEFINITIONS(-DI_CUSTOM_VP1000) ADD_DEFINITIONS(-DI_CUSTOM_VP1000)
ENDIF(tmp) ENDIF(tmp)
ENDIF(CustomVP1000) ENDIF(CustomVP1000)
IF(Extension:ART) IF(Extension:ART)
FILE(GLOB tmp ${src}/special/artio/*.c) FILE(GLOB tmp ${src}/special/artio/*.c)
IF(tmp) IF(tmp)
SET(sources ${sources} ${tmp}) SET(sources ${sources} ${tmp})
INCLUDE_DIRECTORIES(${src}/special/artio) INCLUDE_DIRECTORIES(${src}/special/artio)
ENDIF(tmp) ENDIF(tmp)
ENDIF(Extension:ART) ENDIF(Extension:ART)
# #
# Create target # Create target
...@@ -290,7 +291,7 @@ ENDIF(Port:NoLongLong) ...@@ -290,7 +291,7 @@ ENDIF(Port:NoLongLong)
# #
# Add libraries # Add libraries
# #
TARGET_LINK_LIBRARIES(${target} vtkFiltering vtkHybrid vtkRendering) TARGET_LINK_LIBRARIES(${target} vtkFiltering vtkHybrid vtkRendering GL)
# #
# Optional libraries # Optional libraries
# #
......
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