diff --git a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt index 7e5c4db6fed..dc18b76e00e 100644 --- a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt +++ b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt @@ -14,10 +14,7 @@ if( Qt5_FOUND ) include_directories (BEFORE ../../include) - get_dependency_version(OPENGL) - - get_dependency_version(QT5 QT) - + message( STATUS "USING Qt5_VERSION = '${Qt5Core_VERSION_STRING}'" ) if(COMMAND add_config_flag) set( CGAL_HAS_QT5 TRUE ) add_config_flag( CGAL_HAS_QT5 ) diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page index bead80bb10f..649d3763a26 100755 --- a/Maintenance/test_handling/create_testresult_page +++ b/Maintenance/test_handling/create_testresult_page @@ -450,9 +450,7 @@ sub print_platform_descriptions() BOOST MPFR GMP -QT3 -QT4 -OPENGL +QT5 LEDA CXXFLAGS LDFLAGS diff --git a/Maintenance/test_handling/to_zipped_format b/Maintenance/test_handling/to_zipped_format index 76103d53b96..94ee0fe2e11 100755 --- a/Maintenance/test_handling/to_zipped_format +++ b/Maintenance/test_handling/to_zipped_format @@ -51,7 +51,7 @@ sub reformat_results($) $_ = $line; open (PLATFORM_INFO,">${platform}.info") or return; open (PLATFORM_NEW_RESULTS,">${platform}.new_results") or return; - my ($CGAL_VERSION,$LEDA_VERSION,$TESTER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$QT4,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-","-","no"); + my ($CGAL_VERSION,$LEDA_VERSION,$TESTER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$QT4,$QT5,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-","-","no"); my ($LDFLAGS,$CXXFLAGS) = ("", ""); while (! /^------/) { if(/^\s*$/) { @@ -99,6 +99,9 @@ sub reformat_results($) if (/QT4_VERSION = '([^']+)'/) { $QT4="$1"; } + if (/Qt5_VERSION = '([^']+)'/) { + $QT5="$1"; + } if (/BOOST_VERSION = '([^']+)'/) { $BOOST="$1"; } @@ -144,9 +147,7 @@ $CMAKE $BOOST $MPFR $GMP -$QT -$QT4 -$OPENGL +$QT5 $LEDA_VERSION $CXXFLAGS $LDFLAGS diff --git a/Testsuite/test/collect_cgal_testresults_from_cmake b/Testsuite/test/collect_cgal_testresults_from_cmake index f38beeea9b9..7d4f7468dfc 100755 --- a/Testsuite/test/collect_cgal_testresults_from_cmake +++ b/Testsuite/test/collect_cgal_testresults_from_cmake @@ -282,6 +282,7 @@ parse_lib_building_results "libCGALCore" "CGAL_Core" parse_lib_building_results "libCGALimageIO" "CGAL_ImageIO" parse_lib_building_results "libCGALQt" "CGAL_Qt3" parse_lib_building_results "libCGALQt4" "CGAL_Qt4" +parse_lib_building_results "libCGALQt5" "CGAL_Qt5" for DIR in $TEST_DIRECTORIES ; do if [ -d "$DIR" ] ; then