X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeYACSConfig.cmake.in;h=e24367eca1c6fff0bf5b5a06e9055920b97a6b05;hb=9b426fe5dd8235c1341ff5a5be6030a5c79ef55d;hp=2c4a683c09f387c8f8f16ffcd98b7cdd3758eb28;hpb=a3a44dee17f3bf0be87b5d975e2c6cc377a1dd15;p=modules%2Fyacs.git

diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in
index 2c4a683c0..e24367eca 100644
--- a/SalomeYACSConfig.cmake.in
+++ b/SalomeYACSConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -78,7 +78,7 @@ ELSE()
   ENDIF()
 ENDIF()
 IF(SALOME_YACS_BUILD_GUI)
-  SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
+  SET_AND_CHECK(GUI_ROOT_DIR "@PACKAGE_GUI_ROOT_DIR@")
   LIST(APPEND YACS_DEFINITIONS "@GUI_DEFINITIONS@")
 ENDIF()
 
@@ -132,14 +132,15 @@ SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
 IF(SALOME_YACS_BUILD_GUI)
   # Include GUI targets if they were not already loaded:
+  FIND_PACKAGE(SalomeGUI)
   IF(NOT (TARGET Event)) 
-    INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake")
+    INCLUDE("${GUI_ROOT_DIR}/adm_local/cmake_files/SalomeGUITargets.cmake")
   ENDIF()
 ELSE(SALOME_YACS_BUILD_GUI) 
   IF(SALOME_YACS_USE_KERNEL) 
     # Include KERNEL targets if they were not already loaded:
     IF(NOT (TARGET SALOMEBasics)) 
-      INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
+      INCLUDE("${KERNEL_ROOT_DIR_EXP}/salome_adm/cmake_files/SalomeKERNELTargets.cmake")
     ENDIF()
   ENDIF(SALOME_YACS_USE_KERNEL)
 ENDIF(SALOME_YACS_BUILD_GUI)
@@ -149,6 +150,7 @@ SET(YACS_YACSloader YACSloader)
 SET(YACS_YACSBases YACSBases)
 SET(YACS_YACSlibEngine YACSlibEngine)
 SET(YACS_YACSRuntimeSALOME YACSRuntimeSALOME)
+SET(YACS_YACSevalYFX YACSevalYFX)
 SET(YACS_YACSDLTest YACSDLTest)
 SET(YACS_SalomeIDLYACS SalomeIDLYACS)
 #TODO:
@@ -156,6 +158,7 @@ SET(YACS_SalomeIDLYACS SalomeIDLYACS)
 #SET(YACS_PluginSimplex PluginSimplex)
 #SET(YACS_PluginOptEvTest1 PluginOptEvTest1)
 SET(YACS_HMI HMI)
+SET(YACS_ydfxwidgets ydfxwidgets)
 SET(YACS_GenericGui GenericGui)
 SET(YACS_YACS YACS)
 SET(YACS_SalomeWrap SalomeWrap)