diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page index 24f6451b68d..69bb32dd478 100755 --- a/Maintenance/test_handling/create_testresult_page +++ b/Maintenance/test_handling/create_testresult_page @@ -324,6 +324,7 @@ sub print_platform_descriptions() w n r +CMake BOOST MPFR GMP @@ -362,7 +363,7 @@ EOF my $countn = $testresults[$platform_num]->{"n"}; my $countr = $testresults[$platform_num]->{"r"}; - my $index = 12; + my $index = 13; my @tmp; while ($index) { $index--; @@ -382,7 +383,7 @@ EOF print OUTPUT "$countw\n"; print OUTPUT "$countn\n"; print OUTPUT "$countr\n"; - $index = 12; + $index = 13; while ($index) { $index--; $_ = $tmp[$index]; diff --git a/Maintenance/test_handling/to_zipped_format b/Maintenance/test_handling/to_zipped_format index ad890469e06..346431d8b8d 100755 --- a/Maintenance/test_handling/to_zipped_format +++ b/Maintenance/test_handling/to_zipped_format @@ -41,7 +41,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,$BLAS,$LAPACK,$OPENGL,$TAUCS,$BOOST,$QT,$QT4) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-"); + my ($CGAL_VERSION,$LEDA_VERSION,$TESTER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$BLAS,$LAPACK,$OPENGL,$TAUCS,$BOOST,$QT,$QT4,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-","no"); my ($LDFLAGS,$CXXFLAGS) = ("", ""); while (! /^------/) { if(/^\s*$/) { @@ -50,6 +50,9 @@ sub reformat_results($) if(/^-- USING /) { $use_cmake = 1; } + if(/^-- USING CMake version: ([\w\.-]+)/) { + $CMAKE = $1; + } if (/^CGAL_VERSION\s+([\w\.-]+)/) { $CGAL_VERSION = $1; } @@ -139,6 +142,7 @@ $CGAL_VERSION $TESTER $TESTER_NAME $TESTER_ADDRESS +$CMAKE $BOOST $MPFR $GMP