diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp index b62f8c3b568d2c5298980a08be807419c4d2eb35..654f25761f91f8bd37889fc04334f32158036c84 100644 --- a/Common/CommandLine.cpp +++ b/Common/CommandLine.cpp @@ -34,7 +34,7 @@ #endif #if defined(HAVE_OCC) -#include <Standard_Version.hxx> +#include "Standard_Version.hxx" #endif #if defined(HAVE_POST) @@ -929,13 +929,14 @@ void GetOptions(int argc, char *argv[]) FL_MINOR_VERSION, FL_PATCH_VERSION); #endif #if defined(HAVE_PETSC) - fprintf(stderr, "PETSc version : %d.%d.%d\n", PETSC_VERSION_MAJOR, - PETSC_VERSION_MINOR, PETSC_VERSION_SUBMINOR); + fprintf(stderr, "PETSc version : %d.%d.%d (%s arithmtic)\n", PETSC_VERSION_MAJOR, + PETSC_VERSION_MINOR, PETSC_VERSION_SUBMINOR, #if defined(PETSC_USE_COMPLEX) - fprintf(stderr, "PETSc arithmetic : Complex\n"); + "complex" #else - fprintf(stderr, "PETSc arithmetic : Real\n"); + "real" #endif + ); #endif #if defined(HAVE_OCC) fprintf(stderr, "OCC version : %d.%d.%d\n", OCC_VERSION_MAJOR, diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp index 0d6fedc413e3f14a97eebae652898926c4a35e4b..b5bbc920a46007ea1859e4accec6a273e2030d2f 100644 --- a/Fltk/helpWindow.cpp +++ b/Fltk/helpWindow.cpp @@ -26,6 +26,10 @@ #include "petsc.h" #endif +#if defined(HAVE_OCC) +#include "Standard_Version.hxx" +#endif + static const char *help_link(Fl_Widget *w, const char *uri) { fl_open_uri(uri); @@ -309,10 +313,14 @@ helpWindow::helpWindow() << "<li><i>PETSc version:</i> " << PETSC_VERSION_MAJOR << "." << PETSC_VERSION_MINOR << "." << PETSC_VERSION_SUBMINOR #if defined(PETSC_USE_COMPLEX) - << "<li><i>PETSc arithmetic:</i> Complex" + << " (complex arithmetic)" #else - << "<li><i>PETSc arithmetic:</i> Real" + << " (real arithmetic)" +#endif #endif +#if defined(HAVE_OCC) + << "<li><i>OCC version:</i> " << OCC_VERSION_MAJOR << "." + << OCC_VERSION_MINOR << "." << OCC_VERSION_MAINTENANCE #endif << "<li><i>Packaged by:</i> " << GetGmshPackager() << "</ul>"