From 233846b59e4a2bb898691fc220a939f9ac1c614d Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 4 Apr 2021 11:58:42 +0200
Subject: [PATCH] [T] XdmfDiff; Correct copyright/version message.
---
Tests/xdmfdiff/CMakeLists.txt | 2 +-
Tests/xdmfdiff/xdmfdiff.cpp | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Tests/xdmfdiff/CMakeLists.txt b/Tests/xdmfdiff/CMakeLists.txt
index 7b947b01040..b7b08968667 100644
--- a/Tests/xdmfdiff/CMakeLists.txt
+++ b/Tests/xdmfdiff/CMakeLists.txt
@@ -1,3 +1,3 @@
add_executable(xdmfdiff xdmfdiff.cpp)
-target_link_libraries(xdmfdiff OgsXdmf std::filesystem tclap)
+target_link_libraries(xdmfdiff OgsXdmf GitInfoLib std::filesystem tclap)
install(PROGRAMS $<TARGET_FILE:xdmfdiff> DESTINATION bin)
diff --git a/Tests/xdmfdiff/xdmfdiff.cpp b/Tests/xdmfdiff/xdmfdiff.cpp
index 16d2ac9d849..b7966fa3e3b 100644
--- a/Tests/xdmfdiff/xdmfdiff.cpp
+++ b/Tests/xdmfdiff/xdmfdiff.cpp
@@ -1,12 +1,11 @@
/**
* \file
* \copyright
- * Copyright (c) 2015-2021, OpenGeoSys Community (http://www.opengeosys.org)
+ * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*/
-
#include <tclap/CmdLine.h>
#include <Xdmf.hpp>
@@ -24,6 +23,8 @@
#include <memory>
#include <sstream>
#include <tuple>
+
+#include "InfoLib/GitInfo.h"
// See https://stackoverflow.com/a/8513803/2706707
template <typename... Containers>
auto zip(Containers&&... containers) -> boost::iterator_range<
@@ -54,14 +55,13 @@ struct Args
auto parseCommandLine(int argc, char* argv[]) -> Args
{
TCLAP::CmdLine cmd(
- "XdmfDiff software.\n"
- "Copyright (c) 2015-2020, OpenGeoSys Community "
- "(http://www.opengeosys.org) "
- "Distributed under a Modified BSD License. "
- "See accompanying file LICENSE.txt or "
- "http://www.opengeosys.org/project/license",
- ' ',
- "0.1");
+ "XdmfDiff software.\n\n"
+ "OpenGeoSys-6 software, version " +
+ GitInfoLib::GitInfo::ogs_version +
+ ".\n"
+ "Copyright (c) 2012-2021, OpenGeoSys Community "
+ "(http://www.opengeosys.org)",
+ ' ', GitInfoLib::GitInfo::ogs_version);
TCLAP::UnlabeledValueArg<std::string> xdmf_input_a_arg(
"input-file-a", "Path to the Xdmf input file.", true, "", "XDMF FILE");
@@ -299,4 +299,4 @@ int main(int argc, char* argv[])
}
return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
--
GitLab