spns #18828 PMML as external product

[modules/yacs.git] / SalomeYACSConfig.cmake.in

diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in
old mode 100755 (executable)
new mode 100644 (file)
index 95d65af..e24367e
--- a/SalomeYACSConfig.cmake.in
+++ b/SalomeYACSConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2007-2016  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,24 +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:
-  SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
-  IF(EXISTS ${GUI_ROOT_DIR})
-    LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
-    FIND_PACKAGE(SalomeGUI)
-    SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
-    SALOME_GUI_MODE(SALOME_USE_QXGRAPHVIEWER) # check whether GUI is built with the QxGraphViewer
-  ELSE(EXISTS ${GUI_ROOT_DIR})
-    MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR or turn option SALOME_BUILD_GUI to OFF !")
-  ENDIF(EXISTS ${GUI_ROOT_DIR})
-  SALOME_LOG_OPTIONAL_PACKAGE(SalomeGUI SALOME_BUILD_GUI)
+  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)