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

Do not build the demo when WITH_CGAL_Qt5=OFF

This commit is contained in:
Laurent Rineau 2015-08-03 17:09:52 +02:00
parent ccbda1a5ee
commit c6e8f8baa2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
View File

@ -25,7 +25,7 @@ if(Qt5_FOUND)
find_package(QGLViewer) find_package(QGLViewer)
endif(Qt5_FOUND) endif(Qt5_FOUND)
if (CGAL_FOUND AND OPENGL_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND TARGET Qt5::qcollectiongenerator) if (CGAL_FOUND AND CGAL_Qt5_FOUND AND OPENGL_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND TARGET Qt5::qcollectiongenerator)
include_directories( ${QGLVIEWER_INCLUDE_DIR} ) include_directories( ${QGLVIEWER_INCLUDE_DIR} )
@ -77,7 +77,7 @@ else ()
set(PERIODIC_TRIANGULATION_MISSING_DEPS "") set(PERIODIC_TRIANGULATION_MISSING_DEPS "")
if(NOT CGAL_FOUND) if(NOT CGAL_Qt5_FOUND)
set(PERIODIC_TRIANGULATION_MISSING_DEPS "the CGAL Qt5 library, ${PERIODIC_TRIANGULATION_MISSING_DEPS}") set(PERIODIC_TRIANGULATION_MISSING_DEPS "the CGAL Qt5 library, ${PERIODIC_TRIANGULATION_MISSING_DEPS}")
endif() endif()

6
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
View File

@ -24,7 +24,7 @@ if(Qt5_FOUND)
find_package(QGLViewer) find_package(QGLViewer)
endif(Qt5_FOUND) endif(Qt5_FOUND)
if ( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND TARGET Qt5::qcollectiongenerator ) if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND TARGET Qt5::qcollectiongenerator )
include_directories (${QGLVIEWER_INCLUDE_DIR}) include_directories (${QGLVIEWER_INCLUDE_DIR})
@ -60,11 +60,11 @@ if ( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND TARGET Qt
target_link_libraries( Periodic_Lloyd_3 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ) target_link_libraries( Periodic_Lloyd_3 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
target_link_libraries( Periodic_Lloyd_3 ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) target_link_libraries( Periodic_Lloyd_3 ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
else( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE ) else( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )
set(PERIODIC_LLOYD_MISSING_DEPS "") set(PERIODIC_LLOYD_MISSING_DEPS "")
if(NOT CGAL_FOUND) if(NOT CGAL_Qt5_FOUND)
set(PERIODIC_LLOYD_MISSING_DEPS "the CGAL Qt5 library, ${PERIODIC_LLOYD_MISSING_DEPS}") set(PERIODIC_LLOYD_MISSING_DEPS "the CGAL Qt5 library, ${PERIODIC_LLOYD_MISSING_DEPS}")
endif() endif()

6
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
View File

@ -48,7 +48,7 @@ if( TBB_FOUND )
include(${TBB_USE_FILE}) include(${TBB_USE_FILE})
endif() endif()
if ( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )
include_directories (${QGLVIEWER_INCLUDE_DIR}) include_directories (${QGLVIEWER_INCLUDE_DIR})
include_directories (BEFORE ../../include ./ ) include_directories (BEFORE ../../include ./ )
@ -77,7 +77,7 @@ else( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )
set(TRIANGULATION_3_MISSING_DEPS "") set(TRIANGULATION_3_MISSING_DEPS "")
if(NOT CGAL_FOUND) if(NOT CGAL_Qt5_FOUND)
set(TRIANGULATION_3_MISSING_DEPS "the CGAL Qt5 library, ${TRIANGULATION_3_MISSING_DEPS}") set(TRIANGULATION_3_MISSING_DEPS "the CGAL Qt5 library, ${TRIANGULATION_3_MISSING_DEPS}")
endif() endif()
@ -96,4 +96,4 @@ else( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )
message(STATUS "NOTICE: This demo requires ${TRIANGULATION_3_MISSING_DEPS}and will not be compiled.") message(STATUS "NOTICE: This demo requires ${TRIANGULATION_3_MISSING_DEPS}and will not be compiled.")
endif( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) endif( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )