Fix GUI compilation with CMake

diff --git a/salome_adm/cmake_files/FindKERNEL.cmake b/salome_adm/cmake_files/FindKERNEL.cmake
index f80d158336c62462042ec5dc60bce425fa51107d..a4fbbd9939b89536ad027819dc656d11f5092313 100644 (file)
--- a/salome_adm/cmake_files/FindKERNEL.cmake
+++ b/salome_adm/cmake_files/FindKERNEL.cmake
@@ -61,3 +61,4 @@ FIND_LIBRARY(SALOMETraceCollectorTest SALOMETraceCollectorTest ${KERNEL_ROOT_DIR
 FIND_LIBRARY(TOOLSDS TOOLSDS ${KERNEL_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(UtilsTest UtilsTest ${KERNEL_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(with_loggerTraceCollector with_loggerTraceCollector ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeKernelHelpers SalomeKernelHelpers ${KERNEL_ROOT_DIR}/lib/salome)

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 64e31578507be92478926c798aaf505d2b2ef158..ce853b7c99e4bdfd6d65910dc380483854c39c5d 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -245,6 +245,7 @@ class CMakeFile(object):
             "TOOLSDS",
             "UtilsTest",
             "with_loggerTraceCollector",
+            "SalomeKernelHelpers",
             ]
         gui_list = [
             "caf",
@@ -1425,7 +1426,11 @@ class CMakeFile(object):
             newlines.append('''
             FOREACH(output ${MOC_FILES})
             ''')
-            if self.module in ["jobmanager", "yacs"]:
+            if self.module in ["jobmanager", "yacs"] or \
+               (self.module == "gui" and \
+                (self.root[-len('GuiHelpers'):] == 'GuiHelpers' or \
+                 self.root[-len('TreeData'):] == 'TreeData' or \
+                 self.root[-len('TreeData/Test'):] == 'TreeData/Test')):
                 newlines.append('''
                 STRING(REGEX REPLACE _moc.cxx .hxx input ${output})
                 ''')