From 3226867e2537e740cf89de89d724354201469fad Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 23 Oct 2013 07:00:54 +0000
Subject: [PATCH] Fix compilation problem

---
 src/salomewrap/CMakeLists.txt | 28 +++++++++++++---------------
 src/yacsloader/CMakeLists.txt | 34 +++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/salomewrap/CMakeLists.txt b/src/salomewrap/CMakeLists.txt
index 5c6d214e5..d558cb2cc 100644
--- a/src/salomewrap/CMakeLists.txt
+++ b/src/salomewrap/CMakeLists.txt
@@ -21,15 +21,11 @@ INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 
-IF(SALOME_YACS_USE_KERNEL)
-  SET(SALOME_INCL_PATH ${KERNEL_INCLUDE_DIRS})
-ENDIF(SALOME_YACS_USE_KERNEL)
-
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${QT_INCLUDE_DIR}
-  ${SALOME_INCL_PATH}
+  ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/bases
   )
@@ -41,22 +37,24 @@ ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${QT_DEFINITIONS}
+  ${KERNEL_DEFINITIONS}
+  ${GUI_DEFINITIONS}
   )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  QtCore
-  QtGui
+  ${QT_LIBRARIES}
   ${OMNIORB_LIBRARIES}
+  ${SALOME_LIBS}
+  ${KERNEL_SalomeIDLKernel}
+  ${GUI_CAM}
+  ${GUI_suit}
+  ${GUI_LightApp}
+  ${GUI_qtx}
+  ${GUI_QxScene}
+  ${GUI_ObjBrowser}
+  ${GUI_SalomeApp}
   YACSlibEngine
-  SalomeIDLKernel
-  CAM
-  suit
-  LightApp
-  qtx
-  QxScene
-  ObjBrowser
-  SalomeApp
   )
 
 # header files / to be processed by moc
diff --git a/src/yacsloader/CMakeLists.txt b/src/yacsloader/CMakeLists.txt
index cfd7ffbe2..42d1f13c5 100644
--- a/src/yacsloader/CMakeLists.txt
+++ b/src/yacsloader/CMakeLists.txt
@@ -24,32 +24,32 @@ ENDIF(SALOME_BUILD_TESTS)
 # --- options ---
 
 IF(SALOME_YACS_USE_KERNEL)
+  INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
+  ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
+
   SET(SALOME_LIBS 
     ${KERNEL_DEFINITIONS}
-    SalomeLifeCycleCORBA 
-    SalomeIDLKernel 
-    SalomeNS
-    SalomeContainer 
-    SALOMEBasics 
-    SalomeResourcesManager 
-    OpUtil 
-    SALOMELocalTrace 
-    Registry 
-    SalomeNotification 
-    ResourcesManager 
-    SalomeHDFPersist 
-    SalomeGenericObj
+    ${KERNEL_SalomeLifeCycleCORBA}
+    ${KERNEL_SalomeIDLKernel}
+    ${KERNEL_SalomeNS}
+    ${KERNEL_SalomeContainer}
+    ${KERNEL_SALOMEBasics}
+    ${KERNEL_SalomeResourcesManager}
+    ${KERNEL_OpUtil}
+    ${KERNEL_SALOMELocalTrace}
+    ${KERNEL_Registry}
+    ${KERNEL_SalomeNotification}
+    ${KERNEL_ResourcesManager}
+    ${KERNEL_SalomeHDFPersist}
+    ${KERNEL_SalomeGenericObj}
     )
-  SET(SALOME_INCL_PATH ${KERNEL_INCLUDE_DIRS})
-
   IF(SALOME_YACS_USE_DSC)
-    LIST(APPEND SALOME_LIBS SalomeDSCContainer)
+    LIST(APPEND SALOME_LIBS ${KERNEL_SalomeDSCContainer})
   ENDIF(SALOME_YACS_USE_DSC)
 ENDIF(SALOME_YACS_USE_KERNEL)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${SALOME_INCL_PATH}
   ${OMNIORB_INCLUDE_DIR}
   ${EXPAT_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIR}
-- 
2.39.2