From 831d6347987de2abd8a906e2d5fd84d5f51ab365 Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 11 Jun 2015 14:48:50 +0300 Subject: [PATCH] CMake improvement: usage of SALOME_GUI_MODE() macro --- CMakeLists.txt | 3 ++- src/HOMARDGUI/HOMARDGUI.cxx | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3738be5d..b806c061 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,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/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx index a0c2945a..d7595169 100644 --- a/src/HOMARDGUI/HOMARDGUI.cxx +++ b/src/HOMARDGUI/HOMARDGUI.cxx @@ -704,7 +704,9 @@ void HOMARDGUI::windows( QMap& theMap ) const { theMap.clear(); theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); +#ifndef DISABLE_PYCONSOLE theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); +#endif } //============================================================================= -- 2.39.2