CMake improvement: usage of SALOME_GUI_MODE() macro

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d43d382bf4dc3528adecd228c82ddc053a560c9..30c7b0b29bdab6b2c48fcd087977efd3b5e6de96 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,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)
 ELSE(EXISTS ${GUI_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 ENDIF(EXISTS ${GUI_ROOT_DIR})

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
index 8aa1f5497dd9e21c9fb4d5e4998e5fb9eaed935d..e8b6d2942417c1e5e57277171c4d1dde4d6f8ab0 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
@@ -203,7 +203,9 @@ void ATOMSOLVGUI::studyClosed( SUIT_Study* theStudy )
 void ATOMSOLVGUI::windows( QMap<int, int>& theMap ) const
 {
   theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+#ifndef DISABLE_PYCONSOLE
   theMap.insert( SalomeApp_Application::WT_PyConsole,     Qt::BottomDockWidgetArea );
+#endif
 }
 
 // Default view managers