From 3f98cd8b56356dfcfc212a5c6da4b7e55a0f3028 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 6 Oct 2017 13:53:41 +0300 Subject: [PATCH] Clean-up redundant code --- CMakeLists.txt | 7 ++----- bin/gui_setenv.py | 7 ------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3b29be55..50ec2dabc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,8 +286,6 @@ SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") # Specific to GUI: -SET(SALOME_GUI_INSTALL_PARAVIEW_LIBS lib/paraview CACHE PATH - "Install path: SALOME GUI ParaView libraries") SET(SALOME_GUI_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/gui" CACHE PATH "Install path: SALOME GUI specific data") SET(SALOME_GUI_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/gui" CACHE PATH @@ -299,15 +297,14 @@ MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SAL MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) -MARK_AS_ADVANCED(SALOME_GUI_INSTALL_PARAVIEW_LIBS SALOME_GUI_INSTALL_RES_DATA SALOME_GUI_INSTALL_RES_SCRIPTS SALOME_GUI_INSTALL_PLUGINS) +MARK_AS_ADVANCED(SALOME_GUI_INSTALL_RES_DATA SALOME_GUI_INSTALL_RES_SCRIPTS SALOME_GUI_INSTALL_PLUGINS) MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) # Accumulate environment variables for GUI module SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON} ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}) -SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS} - ${CMAKE_INSTALL_PREFIX}/${SALOME_GUI_INSTALL_PARAVIEW_LIBS}) +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) # Sources # ======== diff --git a/bin/gui_setenv.py b/bin/gui_setenv.py index 0c38bddb4..76ea8027d 100644 --- a/bin/gui_setenv.py +++ b/bin/gui_setenv.py @@ -25,16 +25,9 @@ import os, re def set_env( args ): """Add environment required for GUI module""" - vtk_overloads_dir = os.path.join( os.getenv( "GUI_ROOT_DIR" ), "lib", "paraview" ) - dirs = re.split( ":|;", os.getenv( 'VTK_AUTOLOAD_PATH', vtk_overloads_dir ) ) - if vtk_overloads_dir not in dirs: dirs[0:0] = [vtk_overloads_dir] - #os.environ['VTK_AUTOLOAD_PATH'] = os.pathsep.join(dirs) - #print 'QT_PLUGIN_PATH: ', os.environ['QT_PLUGIN_PATH'] qt_plugin_dir = os.path.join( os.getenv( "QTDIR" ), "plugins" ) dirs = re.split( ":|;", os.getenv( 'QT_PLUGIN_PATH', qt_plugin_dir ) ) if qt_plugin_dir not in dirs: dirs[0:0] = [qt_plugin_dir] dirs2 = list(set(dirs)) os.environ['QT_PLUGIN_PATH'] = os.pathsep.join(dirs2) - #print 'QT_PLUGIN_PATH: ', os.environ['QT_PLUGIN_PATH'] - #print 'QT_QPA_PLATFORM_PLUGIN_PATH: ', os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] return -- 2.39.2