From b5aff46169554fecccd6cbfca60e4ce16202d4a9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 5 Apr 2015 06:45:57 +0000
Subject: [PATCH] report MED version
---
Common/CommandLine.cpp | 8 ++++++++
Fltk/helpWindow.cpp | 12 ++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 654f25761f..e1eff3dfe1 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -37,6 +37,10 @@
#include "Standard_Version.hxx"
#endif
+#if defined(HAVE_MED)
+#include "med.h"
+#endif
+
#if defined(HAVE_POST)
#include "PView.h"
#endif
@@ -941,6 +945,10 @@ void GetOptions(int argc, char *argv[])
#if defined(HAVE_OCC)
fprintf(stderr, "OCC version : %d.%d.%d\n", OCC_VERSION_MAJOR,
OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE);
+#endif
+#if defined(HAVE_MED)
+ fprintf(stderr, "MED version : %d.%d.%d\n", MED_NUM_MAJEUR,
+ MED_NUM_MINEUR, MED_NUM_RELEASE);
#endif
fprintf(stderr, "Packaged by : %s\n", GMSH_PACKAGER);
fprintf(stderr, "Web site : http://www.geuz.org/gmsh/\n");
diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp
index b5bbc920a4..3c0d13271d 100644
--- a/Fltk/helpWindow.cpp
+++ b/Fltk/helpWindow.cpp
@@ -30,6 +30,10 @@
#include "Standard_Version.hxx"
#endif
+#if defined(HAVE_MED)
+#include "med.h"
+#endif
+
static const char *help_link(Fl_Widget *w, const char *uri)
{
fl_open_uri(uri);
@@ -283,7 +287,7 @@ helpWindow::helpWindow()
{
{
int width = 28 * FL_NORMAL_SIZE;
- int height = 18 * BH;
+ int height = 19 * BH;
about = new paletteWindow
(width, height, CTX::instance()->nonModalWindows ? true : false, "About Gmsh");
@@ -295,7 +299,7 @@ helpWindow::helpWindow()
o->box(FL_FLAT_BOX);
std::ostringstream sstream;
sstream << "<center><h3>Gmsh</h3><br>version " << GetGmshVersion()
- << "<p>Copyright (C) 1997-2014"
+ << "<p>Copyright (C) 1997-2015"
<< "<br>Christophe Geuzaine and Jean-Francois Remacle"
<< "<p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> "
<< "and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing "
@@ -321,6 +325,10 @@ helpWindow::helpWindow()
#if defined(HAVE_OCC)
<< "<li><i>OCC version:</i> " << OCC_VERSION_MAJOR << "."
<< OCC_VERSION_MINOR << "." << OCC_VERSION_MAINTENANCE
+#endif
+#if defined(HAVE_MED)
+ << "<li><i>MED version:</i> " << MED_NUM_MAJEUR << "."
+ << MED_NUM_MINEUR << "." << MED_NUM_RELEASE
#endif
<< "<li><i>Packaged by:</i> " << GetGmshPackager()
<< "</ul>"
--
GitLab