From 7b420517722b6989ca6b65f5d743794c3ad35231 Mon Sep 17 00:00:00 2001
From: barate <barate>
Date: Thu, 3 Nov 2011 10:20:50 +0000
Subject: [PATCH] Fix GUI compilation with CMake

---
 salome_adm/cmake_files/FindKERNEL.cmake | 1 +
 salome_adm/cmake_files/am2cmake.py      | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/salome_adm/cmake_files/FindKERNEL.cmake b/salome_adm/cmake_files/FindKERNEL.cmake
index f80d15833..a4fbbd993 100644
--- 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 64e315785..ce853b7c9 100644
--- 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})
                 ''')
-- 
2.39.2