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

Display Qt5 version in testsuite result pages

This commit is contained in:
Laurent Rineau 2015-08-03 13:09:44 +02:00
parent 59b06b3101
commit 93fb88b499
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
View File

@ -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 )

4
Maintenance/test_handling/create_testresult_page
View File

@ -450,9 +450,7 @@ sub print_platform_descriptions()
<th>BOOST</th>
<th>MPFR</th>
<th>GMP</th>
<th>QT3</th>
<th>QT4</th>
<th>OPENGL</th>
<th>QT5</th>
<th>LEDA</th>
<th>CXXFLAGS</th>
<th>LDFLAGS</th>

9
Maintenance/test_handling/to_zipped_format
View File

@ -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

1
Testsuite/test/collect_cgal_testresults_from_cmake
View File

@ -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