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

Use QT4_FOUND instead of QT_FOUND. FindQt4.cmake provides both. 

As we have QT3_FOUND, in FindQt3-patched.cmake, that makes more sens to use
the versionned variable.
This commit is contained in:
Laurent Rineau 2008-11-20 13:25:42 +00:00
parent b861e82892
commit d040b51a80
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt
View File

@ -23,7 +23,7 @@ find_package(Qt4)
find_package(OpenGL) find_package(OpenGL)
find_package(QGLViewer) find_package(QGLViewer)
if ( CGAL_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )
include(${QT_USE_FILE}) include(${QT_USE_FILE})

12
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -38,15 +38,15 @@ find_package(Qt4)
find_package(OpenGL) find_package(OpenGL)
# Find QGLViewer # Find QGLViewer
if(QT_FOUND) if(QT4_FOUND)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
find_package(QGLViewer ) find_package(QGLViewer )
endif(QT_FOUND) endif(QT4_FOUND)
# Find TAUCS (optionnal) # Find TAUCS (optionnal)
find_package(TAUCS) find_package(TAUCS)
if(CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) include_directories ( ${QGLVIEWER_INCLUDE_DIR} )
@ -122,7 +122,7 @@ if(CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
target_link_libraries(Polyhedron_3 ${TAUCS_LIBRARIES}) target_link_libraries(Polyhedron_3 ${TAUCS_LIBRARIES})
endif(TAUCS_FOUND) endif(TAUCS_FOUND)
else (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) else (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
set(POLYHEDRON_MISSING_DEPS "") set(POLYHEDRON_MISSING_DEPS "")
@ -130,7 +130,7 @@ else (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
set(POLYHEDRON_MISSING_DEPS "the CGAL Qt4 library, ${POLYHEDRON_MISSING_DEPS}") set(POLYHEDRON_MISSING_DEPS "the CGAL Qt4 library, ${POLYHEDRON_MISSING_DEPS}")
endif() endif()
if(NOT QT_FOUND) if(NOT QT4_FOUND)
set(POLYHEDRON_MISSING_DEPS "Qt4, ${POLYHEDRON_MISSING_DEPS}") set(POLYHEDRON_MISSING_DEPS "Qt4, ${POLYHEDRON_MISSING_DEPS}")
endif() endif()
@ -144,4 +144,4 @@ else (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
message(STATUS "NOTICE: This demo requires ${POLYHEDRON_MISSING_DEPS}and will not be compiled.") message(STATUS "NOTICE: This demo requires ${POLYHEDRON_MISSING_DEPS}and will not be compiled.")
endif (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) endif (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)