CMake improvement: usage of SALOME_GUI_MODE() macro

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3738be5d0ce7d2dd1024c4d3d50e7b97172a2c52..b806c06199654c7e2c5be7445a185836bddfc3b3 100755 (executable)
--- 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 a0c2945a533082c84c45ce4235b5faacb868648c..d7595169176ba49dec343a7996969f34599505f3 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -704,7 +704,9 @@ void HOMARDGUI::windows( QMap<int, int>& theMap ) const
 {
   theMap.clear();
   theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+#ifndef DISABLE_PYCONSOLE
   theMap.insert( SalomeApp_Application::WT_PyConsole,     Qt::BottomDockWidgetArea );
+#endif
 }
 
 //=============================================================================