X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeYACSConfig.cmake.in;h=9fcf0eb53a55268132e0c09f6b256e642b3e3416;hb=4c927ef1ff3c276c98f958219be6878ec3dfbeb8;hp=b615d5e24845a313d36646b729deda46d4292a21;hpb=d09d23ab61397979c9c39fcd93829ea078fe1d80;p=modules%2Fyacs.git

diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in
index b615d5e24..9fcf0eb53 100644
--- a/SalomeYACSConfig.cmake.in
+++ b/SalomeYACSConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2022  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)