EDF 1123 KERNEL/GUI : Improvment of 'About' dialog box

http://salome.mantis.opencascade.com/view.php?id=20494

diff --git a/configure.ac b/configure.ac
index dd1595702f88dd7d390fefb9602957d73c692b35..dda193f3cc800c6f0d8b4542b3419bdab7fb6870 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ AC_OUTPUT([ \
   src/standalone/Makefile \
   src/standalone/start_jobmanager.sh \
   src/salomegui/Makefile \
+  src/salomegui/JOBMANAGER_version.h \
   doc/Makefile \
   doc/conf.py \
 ])

diff --git a/src/salomegui/BL_SalomeGui.cxx b/src/salomegui/BL_SalomeGui.cxx
index b4112daff37e4c062a9f7b59f517badb50f89f7a..7e03b5271489eabb4d43e9263644bb46337fdb24 100644 (file)
--- a/src/salomegui/BL_SalomeGui.cxx
+++ b/src/salomegui/BL_SalomeGui.cxx
@@ -18,6 +18,7 @@
 //
 
 #include "BL_SalomeGui.hxx"
+#include "JOBMANAGER_version.h"
 
 BL::SalomeGui::SalomeGui() : MainWindows_SALOME("JobManager"), 
                             SalomeApp_Module("JobManager"), 
@@ -131,4 +132,9 @@ extern "C"
   {
     return new BL::SalomeGui();
   }
+
+  char* getModuleVersion()
+  {
+      return (char*)JOBMANAGER_VERSION_STR;
+  }
 }

diff --git a/src/salomegui/JOBMANAGER_version.h.in b/src/salomegui/JOBMANAGER_version.h.in
new file mode 100644 (file)
index 0000000..ba83449
--- /dev/null
+++ b/src/salomegui/JOBMANAGER_version.h.in
@@ -0,0 +1,37 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File   : JOBMANAGER_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+//
+#if !defined(__JOBMANAGER_VERSION_H__)
+#define __JOBMANAGER_VERSION_H__
+
+/*
+  JOBMANAGER_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define JOBMANAGER_VERSION_STR "@VERSION@"
+#define JOBMANAGER_VERSION     @XVERSION@
+
+#endif // __JOBMANAGER_VERSION_H__

diff --git a/src/salomegui/Makefile.am b/src/salomegui/Makefile.am
index edd16ef78a6384de67e7b6ffaccecb34786c0096..af7f056bd2bd0012d173241970f19abe613e66c1 100644 (file)
--- a/src/salomegui/Makefile.am
+++ b/src/salomegui/Makefile.am
@@ -30,7 +30,7 @@ nodist_libJOBMANAGER_la_SOURCES = $(MOC_FILES)
 libJOBMANAGER_la_CXXFLAGS = $(qt4_cppflags) \
                                $(BOOST_CPPFLAGS) \
                                $(OMNIORB_INCLUDES) \
-                               -I../../idl \
+                               -I$(top_builddir)/idl \
                                -I$(KERNEL_ROOT_DIR)/include/salome \
                                -I$(GUI_ROOT_DIR)/include/salome \
                                -I$(top_srcdir)/src/genericgui \
@@ -51,7 +51,8 @@ libJOBMANAGER_la_LIBADD  = $(qt4_libs) \
                               $(top_builddir)/src/wrappers/libBL_Wrappers_SALOME.la \
                               -lSalomeApp
 
-salomeinclude_HEADERS = BL_SalomeGui.hxx
+salomeinclude_HEADERS = BL_SalomeGui.hxx \
+                       JOBMANAGER_version.h
 
 # resources files
 LIBICONS = SalomeApp.xml jobmanager.png