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

Merge pull request #3587 from lrineau/CGAL-demos_Qt_5.12_qcollectiongenerator_is_gone-GF 

Support Qt-5.12: qcollectiongenerator merged into qhelpgenerator
This commit is contained in:
Sebastien Loriot 2019-01-31 11:23:16 +01:00 committed by GitHub
parent 515ca08e59 a11f6562c6
commit e7fcfa40a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,13 @@ if(Qt5_FOUND)
add_definitions(-DQT_NO_KEYWORDS) add_definitions(-DQT_NO_KEYWORDS)
endif(Qt5_FOUND) endif(Qt5_FOUND)
if (CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET Qt5::qcollectiongenerator) if( Qt5Help_VERSION VERSION_LESS 5.12 )
set(CGAL_QCOLLECTIONGENERATOR_TARGET Qt5::qcollectiongenerator)
else()
set(CGAL_QCOLLECTIONGENERATOR_TARGET Qt5::qhelpgenerator)
endif()
if (CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET ${CGAL_QCOLLECTIONGENERATOR_TARGET})
# UI files (Qt Designer files) # UI files (Qt Designer files)
qt5_wrap_ui ( UI_FILES MainWindow.ui ) qt5_wrap_ui ( UI_FILES MainWindow.ui )
@ -35,15 +41,10 @@ if (CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET Qt5::qcollectiongener
qt5_generate_moc( "MainWindow.h" "${CMAKE_CURRENT_BINARY_DIR}/moc_MainWindow.cpp" ) qt5_generate_moc( "MainWindow.h" "${CMAKE_CURRENT_BINARY_DIR}/moc_MainWindow.cpp" )
qt5_generate_moc( "Viewer.h" "${CMAKE_CURRENT_BINARY_DIR}/moc_Viewer.cpp" ) qt5_generate_moc( "Viewer.h" "${CMAKE_CURRENT_BINARY_DIR}/moc_Viewer.cpp" )
if(DEFINED QT_QCOLLECTIONGENERATOR_EXECUTABLE)
else()
set(QT_QCOLLECTIONGENERATOR_EXECUTABLE qcollectiongenerator)
endif()
# generate QtAssistant collection file # generate QtAssistant collection file
add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Periodic_3_triangulation_3.qhc add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Periodic_3_triangulation_3.qhc
DEPENDS Periodic_3_triangulation_3.qhp Periodic_3_triangulation_3.qhcp DEPENDS Periodic_3_triangulation_3.qhp Periodic_3_triangulation_3.qhcp
COMMAND Qt5::qcollectiongenerator COMMAND ${CGAL_QCOLLECTIONGENERATOR_TARGET}
${CMAKE_CURRENT_SOURCE_DIR}/Periodic_3_triangulation_3.qhcp ${CMAKE_CURRENT_SOURCE_DIR}/Periodic_3_triangulation_3.qhcp
-o ${CMAKE_CURRENT_BINARY_DIR}/Periodic_3_triangulation_3.qhc -o ${CMAKE_CURRENT_BINARY_DIR}/Periodic_3_triangulation_3.qhc
) )
@ -80,8 +81,8 @@ else ()
set(PERIODIC_TRIANGULATION_MISSING_DEPS "Qt5, ${PERIODIC_TRIANGULATION_MISSING_DEPS}") set(PERIODIC_TRIANGULATION_MISSING_DEPS "Qt5, ${PERIODIC_TRIANGULATION_MISSING_DEPS}")
endif() endif()
if (NOT TARGET Qt5::qcollectiongenerator) if (NOT TARGET ${CGAL_QCOLLECTIONGENERATOR_TARGET})
set(PERIODIC_TRIANGULATION_MISSING_DEPS "qcollectiongenerator, ${PERIODIC_TRIANGULATION_MISSING_DEPS}") set(PERIODIC_TRIANGULATION_MISSING_DEPS "${CGAL_QCOLLECTIONGENERATOR_TARGET}, ${PERIODIC_TRIANGULATION_MISSING_DEPS}")
endif() endif()
message(STATUS "NOTICE: This demo requires ${PERIODIC_TRIANGULATION_MISSING_DEPS}and will not be compiled.") message(STATUS "NOTICE: This demo requires ${PERIODIC_TRIANGULATION_MISSING_DEPS}and will not be compiled.")

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

@ -23,8 +23,13 @@ include(${CGAL_USE_FILE})
find_package(Qt5 QUIET COMPONENTS Xml Script Help OpenGL Svg) find_package(Qt5 QUIET COMPONENTS Xml Script Help OpenGL Svg)
if( Qt5Help_VERSION VERSION_LESS 5.12 )
set(CGAL_QCOLLECTIONGENERATOR_TARGET Qt5::qcollectiongenerator)
else()
set(CGAL_QCOLLECTIONGENERATOR_TARGET Qt5::qhelpgenerator)
endif()
if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET Qt5::qcollectiongenerator ) if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET ${CGAL_QCOLLECTIONGENERATOR_TARGET} )
include_directories (BEFORE ../../include ./ ) include_directories (BEFORE ../../include ./ )
@ -43,7 +48,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET Qt5::qcollectiongene
# generate QtAssistant collection file # generate QtAssistant collection file
add_custom_command ( OUTPUT Periodic_Lloyd_3.qhc add_custom_command ( OUTPUT Periodic_Lloyd_3.qhc
DEPENDS Periodic_Lloyd_3.qhp Periodic_Lloyd_3.qhcp DEPENDS Periodic_Lloyd_3.qhp Periodic_Lloyd_3.qhcp
COMMAND Qt5::qcollectiongenerator COMMAND ${CGAL_QCOLLECTIONGENERATOR_TARGET}
${CMAKE_CURRENT_SOURCE_DIR}/Periodic_Lloyd_3.qhcp ${CMAKE_CURRENT_SOURCE_DIR}/Periodic_Lloyd_3.qhcp
-o ${CMAKE_CURRENT_BINARY_DIR}/Periodic_Lloyd_3.qhc -o ${CMAKE_CURRENT_BINARY_DIR}/Periodic_Lloyd_3.qhc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@ -71,7 +76,7 @@ else( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND QT_QCOLLECTIONGENERATOR_EX
endif() endif()
if(NOT QT_QCOLLECTIONGENERATOR_EXECUTABLE) if(NOT QT_QCOLLECTIONGENERATOR_EXECUTABLE)
set(PERIODIC_LLOYD_MISSING_DEPS "qcollectiongenerator, ${PERIODIC_LLOYD_MISSING_DEPS}") set(PERIODIC_LLOYD_MISSING_DEPS "${CGAL_QCOLLECTIONGENERATOR_TARGET}, ${PERIODIC_LLOYD_MISSING_DEPS}")
endif() endif()