Commit 6478d90f authored by camitk's avatar camitk
Browse files

Merge branch 'feature-22' into develop

parents 11b560d1 a0dd1d89
...@@ -28,10 +28,10 @@ endif() ...@@ -28,10 +28,10 @@ endif()
# Find VTK # Find VTK
find_package(VTK REQUIRED) find_package(VTK REQUIRED)
if(NOT VTK_FOUND) if(NOT VTK_FOUND)
message(SEND_ERROR "Failed to find Vtk 5.8 or greater. This is needed by CamiTK.") message(SEND_ERROR "Failed to find Vtk 6.0.0 or greater. This is needed by CamiTK.")
endif() endif()
if("${VTK_VERSION}" VERSION_LESS 6.0) if("${VTK_VERSION}" VERSION_LESS 6.0)
message(FATAL_ERROR "Found VTK ${VTK_VERSION} version but at least 5.8 is required. Please update your version of VTK.") message(FATAL_ERROR "Found VTK ${VTK_VERSION} version but at least 6.0.0 is required. Please update your version of VTK.")
endif() endif()
message(STATUS "Found suitable version of VTK : ${VTK_VERSION} (required is at least 6.0.0)") message(STATUS "Found suitable version of VTK : ${VTK_VERSION} (required is at least 6.0.0)")
set(CAMITK_VTK_VERSION ${VTK_VERSION_MAJOR}.${VTK_VERSION_MINOR}) set(CAMITK_VTK_VERSION ${VTK_VERSION_MAJOR}.${VTK_VERSION_MINOR})
...@@ -156,7 +156,6 @@ if(MSVC) ...@@ -156,7 +156,6 @@ if(MSVC)
set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkImagingStencil-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkImagingStencil-${CAMITK_VTK_VERSION}.lib) set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkImagingStencil-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkImagingStencil-${CAMITK_VTK_VERSION}.lib)
set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkIOImport-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkIOImport-${CAMITK_VTK_VERSION}.lib) set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkIOImport-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkIOImport-${CAMITK_VTK_VERSION}.lib)
set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkImagingMath-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkImagingMath-${CAMITK_VTK_VERSION}.lib) set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkImagingMath-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkImagingMath-${CAMITK_VTK_VERSION}.lib)
# message( WARNING "Nico CAMITK_VTK_LIBRARIES=${CAMITK_VTK_LIBRARIES}")
# list of all core dependencies # list of all core dependencies
set(CAMITK_LIBRARIES set(CAMITK_LIBRARIES
...@@ -164,22 +163,17 @@ if(MSVC) ...@@ -164,22 +163,17 @@ if(MSVC)
debug qtpropertybrowser${CAMITK_DEBUG_POSTFIX}.lib optimized qtpropertybrowser debug qtpropertybrowser${CAMITK_DEBUG_POSTFIX}.lib optimized qtpropertybrowser
) )
else() else()
# Name of the core library to link against # Name of the core library to link against
set(CAMITK_CORE_LIBRARIES ${CAMITK_CORE_LIB_NAME}) set(CAMITK_CORE_LIBRARIES ${CAMITK_CORE_LIB_NAME})
# list of all core dependencies
set(CAMITK_LIBRARIES
# if(CMAKE_GENERATOR MATCHES "MinGW Makefiles") # Win32 running with MinGW ${VTK_LIBRARIES}
# list of all core dependencies # QVTK
set(CAMITK_LIBRARIES qtpropertybrowser
${VTK_LIBRARIES} )
# QVTK
qtpropertybrowser
)
endif() endif()
# message( WARNING "Nico VTK_LIBRARIES=${VTK_LIBRARIES}")
mark_as_advanced (CAMITK_CORE_LIB CAMITK_LINK_DIRECTORIES CAMITK_INCLUDE_DIRECTORIES CAMITK_LIBRARIES) mark_as_advanced (CAMITK_CORE_LIB CAMITK_LINK_DIRECTORIES CAMITK_INCLUDE_DIRECTORIES CAMITK_LIBRARIES)
# additional unix system resources # additional unix system resources
......
Supports Markdown
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