X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeYACSConfig.cmake.in;h=e24367eca1c6fff0bf5b5a06e9055920b97a6b05;hb=3792b3ca4666903d162623e7c6cbbff132c66e03;hp=ba855f03610a224244e809321381e9734f736c48;hpb=650426e3012ce1f996d0ef99e99f2fc111c4772d;p=modules%2Fyacs.git

diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in
index ba855f036..e24367eca 100644
--- a/SalomeYACSConfig.cmake.in
+++ b/SalomeYACSConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2007-2014  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
@@ -22,6 +22,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #TODO
 ### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE:
@@ -55,7 +56,7 @@ SET(SALOME_YACS_BUILD_TESTS    @SALOME_BUILD_TESTS@)
 SET(SALOME_YACS_BUILD_GUI      @SALOME_BUILD_GUI@)
 SET(SALOME_YACS_USE_KERNEL     @SALOME_YACS_USE_KERNEL@)
 SET(SALOME_YACS_USE_DSC        @SALOME_YACS_USE_DSC@)
-SET(SALOME_YACS_USE_QSCINTILLA @SALOME_YACS_USE_QSCINTILLA@)
+SET(SALOME_YACS_USE_PYEDITOR   @SALOME_YACS_USE_PYEDITOR@)
 SET(SALOME_YACS_USE_SWIG       @SALOME_YACS_USE_SWIG@)
 
 # Optional level 1 prerequisites:
@@ -77,39 +78,38 @@ 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@")
-  IF(SALOME_YACS_USE_QSCINTILLA)
-    SET_AND_CHECK(QSCINTILLA_ROOT_DIR_EXP "@PACKAGE_QSCINTILLA_ROOT_DIR@")
-  ENDIF()
 ENDIF()
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 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)