From: vsr Date: Sat, 15 Oct 2011 13:49:39 +0000 (+0000) Subject: Fix error: KERNEL version is not properly retrieved X-Git-Tag: V6_4_0a1~31 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=559c3691a4ae14ddc53d3fa949b7c1e2f953203c;p=modules%2Fgui.git Fix error: KERNEL version is not properly retrieved --- diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx index 608ded466..8ff235547 100755 --- a/src/CAM/CAM_Application.cxx +++ b/src/CAM/CAM_Application.cxx @@ -770,7 +770,7 @@ CAM_Application::ModuleShortInfoList CAM_Application::getVersionInfo() const { ModuleShortInfo kernel; kernel.name = "KERNEL"; - kernel.version = GUI_VERSION_STR; + kernel.version = KERNEL_VERSION_STR; info.append(kernel); ModuleShortInfo gui; diff --git a/src/CAM/Makefile.am b/src/CAM/Makefile.am index da4c90977..e78ce0a93 100755 --- a/src/CAM/Makefile.am +++ b/src/CAM/Makefile.am @@ -53,6 +53,6 @@ nodist_libCAM_la_SOURCES = $(MOC_FILES) nodist_salomeres_DATA = CAM_msg_en.qm CAM_msg_fr.qm -libCAM_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx -I$(top_builddir) +libCAM_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx libCAM_la_LDFLAGS = $(QT_MT_LIBS) libCAM_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la