diff --git a/CMakeLists.txt b/CMakeLists.txt index d76a4a0064c1fb20a8ae337ff39a14239aa41356..6f781ba033fc56f1c3a9d7098662c714ffa43cbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1669,8 +1669,6 @@ message(STATUS " * C compiler: " ${CMAKE_C_COMPILER}) message(STATUS " * C++ compiler: " ${CMAKE_CXX_COMPILER}) message(STATUS " * Install prefix: " ${CMAKE_INSTALL_PREFIX}) message(STATUS "") -message(STATUS "Run 'ccmake ${CMAKE_CURRENT_SOURCE_DIR}' to fine-tune the configuration.") -message(STATUS "") mark_as_advanced(GMSH_EXTRA_VERSION ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp index 770235040706093a846da0fd8dce2fec472cb7d3..65df25d0058f58f16055d558cba1f7d16570e65d 100644 --- a/Common/CommandLine.cpp +++ b/Common/CommandLine.cpp @@ -28,6 +28,10 @@ #endif #endif +#if defined(HAVE_PETSC) +#include "petsc.h" +#endif + #if defined(HAVE_POST) #include "PView.h" #endif @@ -912,25 +916,25 @@ void GetOptions(int argc, char *argv[]) } else if(!strcmp(argv[i] + 1, "info") || !strcmp(argv[i] + 1, "-info")) { fprintf(stderr, "Version : %s\n", GMSH_VERSION); + fprintf(stderr, "License : %s\n", GMSH_SHORT_LICENSE); + fprintf(stderr, "Build OS : %s\n", GMSH_OS); + fprintf(stderr, "Build date : %s\n", GMSH_DATE); + fprintf(stderr, "Build host : %s\n", GMSH_HOST); + fprintf(stderr, "Build options :%s\n", GMSH_CONFIG_OPTIONS); #if defined(HAVE_FLTK) - fprintf(stderr, "GUI toolkit : FLTK %d.%d.%d\n", FL_MAJOR_VERSION, + fprintf(stderr, "FLTK version : %d.%d.%d\n", FL_MAJOR_VERSION, FL_MINOR_VERSION, FL_PATCH_VERSION); -#else - fprintf(stderr, "GUI toolkit : none\n"); #endif #if defined(HAVE_PETSC) + fprintf(stderr, "PETSc version : %d.%d.%d\n", PETSC_VERSION_MAJOR, + PETSC_VERSION_MINOR, PETSC_VERSION_SUBMINOR); #if defined(PETSC_USE_COMPLEX) fprintf(stderr, "PETSc arithmetic : Complex\n"); #else fprintf(stderr, "PETSc arithmetic : Real\n"); #endif #endif - fprintf(stderr, "License : %s\n", GMSH_SHORT_LICENSE); - fprintf(stderr, "Build OS : %s\n", GMSH_OS); - fprintf(stderr, "Build options :%s\n", GMSH_CONFIG_OPTIONS); - fprintf(stderr, "Build date : %s\n", GMSH_DATE); - fprintf(stderr, "Build host : %s\n", GMSH_HOST); - fprintf(stderr, "Packager : %s\n", GMSH_PACKAGER); + fprintf(stderr, "Packaged by : %s\n", GMSH_PACKAGER); fprintf(stderr, "Web site : http://www.geuz.org/gmsh/\n"); fprintf(stderr, "Mailing list : gmsh@geuz.org\n"); Msg::Exit(0); diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp index ad118176671efb1addbe861a823dd3e459b88cad..8104d03016e0f08878c3f882c98002eb8c751086 100644 --- a/Fltk/helpWindow.cpp +++ b/Fltk/helpWindow.cpp @@ -10,6 +10,7 @@ #include <FL/Fl_Input.H> #include <FL/Fl_Value_Input.H> #include <FL/Fl_Color_Chooser.H> +#include "GmshConfig.h" #include "FlGui.h" #include "helpWindow.h" #include "paletteWindow.h" @@ -21,6 +22,10 @@ #include "Context.h" #include "drawContext.h" +#if defined(HAVE_PETSC) +#include "petsc.h" +#endif + static const char *help_link(Fl_Widget *w, const char *uri) { fl_open_uri(uri); @@ -294,12 +299,21 @@ helpWindow::helpWindow() << "<p>Please send all questions and bug reports to " << "<a href=\"mailto:gmsh@geuz.org\">gmsh@geuz.org</a></center>" << "<ul>" - << "<li><i>GUI toolkit:</i> FLTK " - << FL_MAJOR_VERSION << "." << FL_MINOR_VERSION << "." << FL_PATCH_VERSION << "<li><i>Build OS:</i> " << GetGmshBuildOS() << "<li><i>Build date:</i> " << GetGmshBuildDate() << "<li><i>Build host:</i> " << GetGmshBuildHost() << "<li><i>Build options:</i>" << GetGmshBuildOptions() + << "<li><i>FLTK version:</i> " + << FL_MAJOR_VERSION << "." << FL_MINOR_VERSION << "." << FL_PATCH_VERSION +#if defined(HAVE_PETSC) + << "<li>PETSc version: " << PETSC_VERSION_MAJOR << "." + << PETSC_VERSION_MINOR << "." << PETSC_VERSION_SUBMINOR +#if defined(PETSC_USE_COMPLEX) + << "<li>PETSc arithmetic: Complex" +#else + << "<li>PETSc arithmetic: Real" +#endif +#endif << "<li><i>Packaged by:</i> " << GetGmshPackager() << "</ul>" << "<center>Visit <a href=\"http://geuz.org/gmsh/\">http://geuz.org/gmsh/</a> "