display third party libraries in summary

SaillantNicolas · Jun 12, 2024 · 46f4171 · 46f4171
1 parent ff30601
commit 46f4171
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
@@ -482,11 +482,11 @@ endif()
 
 find_package(TBB QUIET)
 if(TBB_FOUND)
-  message(STATUS "Using TBB version ${TBB_VERSION}")
+  message(STATUS "Third-parties libraries TBB ${TBB_VERSION}")
 endif()
 find_package(Eigen3 QUIET)
 if(Eigen3_FOUND)
-  message(STATUS "Using Eigen3 version ${EIGEN3_VERSION}")
+  message(STATUS "Third-parties libraries Eigen3 ${EIGEN3_VERSION}")
 endif()
 message("== Generate version files (DONE) ==\n")
 

diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page
@@ -752,10 +752,22 @@ sub create_summary_page {
     my @letters = ('r', 'n', 'w', 'o');
     my $letters_options = join("\n", map { "<option value=\"$_\">$_</option>" } @letters);
     my $package_options = join("\n", map { "<option style=\"display: none;\" value=\"$_\">$_</option>" } sort keys %test_directories);
+    my $third_party_libraries = "";
 
     my @search_index;
     my ($platform_num, $platform) = (0, "");
     foreach $platform (@platforms_to_do) {
+        if (open (PLATFORM_INFO, "results_${platform}.info")) {
+            my $line = "";
+            while (<PLATFORM_INFO>) {
+                $line = $_;
+                if ($line =~ /^TPL:/) {
+                    $third_party_libraries = $line;
+                }
+                print "$line\n";
+            }
+            close PLATFORM_INFO;
+        }
         foreach my $letter (@letters) {
             foreach my $test_directory (sort keys %test_directories) {
                 my $resulttext = $testresults[$platform_num]->{$test_directory};
@@ -767,6 +779,7 @@ sub create_summary_page {
                         content => $warnings_and_errors,
                         release => $release_name,
                         letters => $letter,
+                        third_party_libraries => $third_party_libraries,
                     };
                 }
             }
@@ -791,11 +804,11 @@ sub create_summary_page {
         "https://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Summary</title>
-  <link rel="shortcut icon" href="cgal.ico">
-  <link rel="stylesheet" type="text/css" href="testresult.css">
-  <script>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Summary</title>
+    <link rel="shortcut icon" href="cgal.ico">
+    <link rel="stylesheet" type="text/css" href="testresult.css">
+    <script>
     var searchURLs = $json_urls;
     var url = searchURLs["current"]
 
@@ -853,6 +866,9 @@ sub create_summary_page {
             const platformHeader = document.createElement('h2');
             platformHeader.innerText = "Results of " + platform;
             platformDiv.appendChild(platformHeader);
+            const tplDiv = document.createElement('div');
+            tplDiv.innerHTML = items[0].third_party_libraries;
+            platformDiv.appendChild(tplDiv);
             const resultGrid = document.createElement('div');
             resultGrid.className = "result-grid";
             platformDiv.appendChild(resultGrid);

diff --git 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,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","no");
+    my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE,$TPL) = ("-","-","-","-","-","-","-","-","-","-","-","no","TPL:");
     my ($LDFLAGS,$CXXFLAGS) = ("", "");
     while (! /^------/) {
         if(/^\s*$/) {
@@ -132,6 +132,9 @@ sub reformat_results($)
 #            print PLATFORM_NEW_RESULTS $_;
 #            last;
 #        }
+    if (/^-- Third-parties libraries ([\w\.]+ [\w\.\_\-]*)/) {
+        $TPL = "$TPL $1,";
+    }
 NEXT:	if(! ($_= <PLATFORM_RESULTS>)) {
             # should never happen!!
             last;
@@ -154,6 +157,7 @@ $QT
 $LEDA_VERSION
 $CXXFLAGS
 $LDFLAGS
+$TPL
 EOF
     close(PLATFORM_INFO);
     close(PLATFORM_RESULTS);

diff --git a/TDS_3/test/TDS_3/CMakeLists.txt b/TDS_3/test/TDS_3/CMakeLists.txt
@@ -12,6 +12,6 @@ create_single_source_cgal_program("test_triangulation_tds_3.cpp")
 create_single_source_cgal_program("test_io_tds3.cpp")
 
 if(TARGET CGAL::TBB_support)
-  message(STATUS "Found TBB ${TBB_VERSION}")
+  message(STATUS "Third-parties libraries TBB ${TBB_VERSION}")
   target_link_libraries(test_triangulation_tds_3 PUBLIC CGAL::TBB_support)
 endif()