From 164a5d22dd1561bd78141ecb33fa3e85e6678ea3 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 10 Nov 2016 10:06:17 +0100 Subject: [PATCH] Cmake correction for modules depending from YACS --- SalomeYACSConfig.cmake.in | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100644 => 100755 SalomeYACSConfig.cmake.in diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in old mode 100644 new mode 100755 index b615d5e24..95d65afd9 --- a/SalomeYACSConfig.cmake.in +++ b/SalomeYACSConfig.cmake.in @@ -132,6 +132,16 @@ 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) IF(NOT (TARGET Event)) INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") ENDIF() -- 2.39.2