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

display third party libraries in summary

This commit is contained in:
Nicolas Saillant 2024-06-12 11:02:01 +02:00
parent ff30601f36
commit 46f4171ec0
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/CMakeLists.txt
View File

@ -482,11 +482,11 @@ endif()
find_package(TBB QUIET) find_package(TBB QUIET)
if(TBB_FOUND) if(TBB_FOUND)
message(STATUS "Using TBB version ${TBB_VERSION}") message(STATUS "Third-parties libraries TBB ${TBB_VERSION}")
endif() endif()
find_package(Eigen3 QUIET) find_package(Eigen3 QUIET)
if(Eigen3_FOUND) if(Eigen3_FOUND)
message(STATUS "Using Eigen3 version ${EIGEN3_VERSION}") message(STATUS "Third-parties libraries Eigen3 ${EIGEN3_VERSION}")
endif() endif()
message("== Generate version files (DONE) ==\n") message("== Generate version files (DONE) ==\n")

26
Maintenance/test_handling/create_testresult_page
View File

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

6
Maintenance/test_handling/to_zipped_format
View File

@ -51,7 +51,7 @@ sub reformat_results($)
$_ = $line; $_ = $line;
open (PLATFORM_INFO,">${platform}.info") or return; open (PLATFORM_INFO,">${platform}.info") or return;
open (PLATFORM_NEW_RESULTS,">${platform}.new_results") 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) = ("", ""); my ($LDFLAGS,$CXXFLAGS) = ("", "");
while (! /^------/) { while (! /^------/) {
if(/^\s*$/) { if(/^\s*$/) {
@ -132,6 +132,9 @@ sub reformat_results($)
# print PLATFORM_NEW_RESULTS $_; # print PLATFORM_NEW_RESULTS $_;
# last; # last;
# } # }
if (/^-- Third-parties libraries ([\w\.]+ [\w\.\_\-]*)/) {
$TPL = "$TPL $1,";
}
NEXT: if(! ($_= <PLATFORM_RESULTS>)) { NEXT: if(! ($_= <PLATFORM_RESULTS>)) {
# should never happen!! # should never happen!!
last; last;
@ -154,6 +157,7 @@ $QT
$LEDA_VERSION $LEDA_VERSION
$CXXFLAGS $CXXFLAGS
$LDFLAGS $LDFLAGS
$TPL
EOF EOF
close(PLATFORM_INFO); close(PLATFORM_INFO);
close(PLATFORM_RESULTS); close(PLATFORM_RESULTS);

2
TDS_3/test/TDS_3/CMakeLists.txt
View File

@ -12,6 +12,6 @@ create_single_source_cgal_program("test_triangulation_tds_3.cpp")
create_single_source_cgal_program("test_io_tds3.cpp") create_single_source_cgal_program("test_io_tds3.cpp")
if(TARGET CGAL::TBB_support) 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) target_link_libraries(test_triangulation_tds_3 PUBLIC CGAL::TBB_support)
endif() endif()