songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QVTK no longer use QT3. Port the "demo" to Qt4.

This commit is contained in:
Laurent Rineau 2011-09-26 14:18:15 +00:00
parent 1166338b85
commit 49e4851fd5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CGALimageIO/demo/CGALimageIO/CMakeLists.txt
View File

@ -30,17 +30,18 @@ endforeach()
find_package(CGAL REQUIRED ImageIO)
include( ${CGAL_USE_FILE} )
find_package(VTK QUIET)
find_package(Qt3-patched QUIET)
find_package(Qt4 QUIET)
if(QT3_FOUND AND VTK_FOUND)
if(QT_FOUND AND VTK_FOUND)
add_definitions(-DCGAL_USE_VTK)
include(${VTK_USE_FILE})
include(${QT_USE_FILE})
add_definitions(${QT3_DEFINITIONS})
add_definitions(${QT_DEFINITIONS})
if(VTK_USE_QVTK)
include_directories( ${VTK_QT_INCLUDE_DIR} )
include_directories( ${QT3_INCLUDE_DIR} )
include_directories( ${QT_INCLUDE_DIR} )
add_executable( image_to_vtk_viewer image_to_vtk_viewer.cpp )
add_to_cached_list( CGAL_EXECUTABLE_TARGETS image_to_vtk_viewer )
@ -52,7 +53,7 @@ if(QT3_FOUND AND VTK_FOUND)
vtkCommon
${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
${VTK_QT_QT_LIBRARY}
${QT3_LIBRARIES}
${QT_LIBRARIES}
)
else(VTK_USE_QVTK)
message(STATUS "NOTICE: This demo needs QVTK, and will not be compiled.")
@ -61,7 +62,7 @@ else()
if(NOT VTK_FOUND)
message(STATUS "NOTICE: This demo needs VTK, and will not be compiled.")
endif()
if(NOT QT3_FOUND)
message(STATUS "NOTICE: This demo needs Qt3, and will not be compiled.")
if(NOT QT_FOUND)
message(STATUS "NOTICE: This demo needs Qt4, and will not be compiled.")
endif()
endif()

2
CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp
View File

@ -15,7 +15,7 @@
#ifdef CGAL_USE_VTK
#include <qapplication.h>
#include <QApplication>
#include <iostream>
#include <cstdlib>
#include <sstream>