From 0e2b89acdb07db20088c2386fd6657f4e5078906 Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 11 Jun 2015 14:43:57 +0300 Subject: [PATCH] CMake improvement: usage of SALOME_GUI_MODE() macro --- CMakeLists.txt | 3 ++- src/HELLOGUI/HELLOGUI.cxx | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ea2d8e..c38d825 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,8 @@ 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 REQUIRED) - FULL_GUI(TRUE) # check whether GUI builded in full mode and with CORBA + SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA + SALOME_GUI_MODE(OPTIONAL SALOME_USE_PYCONSOLE) ADD_DEFINITIONS(${GUI_DEFINITIONS}) INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS}) ELSE(EXISTS ${GUI_ROOT_DIR}) diff --git a/src/HELLOGUI/HELLOGUI.cxx b/src/HELLOGUI/HELLOGUI.cxx index ee8e63b..27a0e40 100644 --- a/src/HELLOGUI/HELLOGUI.cxx +++ b/src/HELLOGUI/HELLOGUI.cxx @@ -256,9 +256,11 @@ void HELLOGUI::windows( QMap& theMap ) const // want Object browser, in the left area theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); +#ifndef DISABLE_PYCONSOLE // want Python console, in the bottom area theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); +#endif } /*! -- 2.39.2