Merge pull request #38904 from mantidproject/fix_conda_install

Only set XKB_CONFIG_ROOT for standalone installs & set GSETTINGS_SCHEMA_DEFINITIONS properly on conda installs

Author: thomashampson

buildconfig/CMake/LinuxPackageScripts.cmake

@@ -56,7 +56,7 @@ fi"
 )
 
 # The scripts need jemalloc to be resolved to the runtime library as the plain .so symlink is only present when a
-# -dev/-devel package is presentz
+# -dev/-devel package is present
 if(JEMALLOCLIB_FOUND)
   get_filename_component(JEMALLOC_RUNTIME_LIB ${JEMALLOC_LIBRARIES} REALPATH)
   # We only want to use the major version number
@@ -92,15 +92,6 @@ if [ -n \"\$1\" ] && [ \"\$1\" = \"--debug\" ]; then
 fi"
 )
 
-# Without specifying these schema files, the standalone can fail to launch on Linux. Inside a conda environment this
-# environment variable is set by something else.
-set(GSETTINGS_SCHEMA_DEFINITIONS
-    "# Specify path to schema files
-if [ -z \"\${GSETTINGS_SCHEMA_DIR}\" ]; then
-    GSETTINGS_MANTID_PATH=\${INSTALLDIR}/share/glib-2.0/schemas
-fi"
-)
-
 set(ERROR_CMD "-m mantidqt.dialogs.errorreports.main --exitcode=\$?")
 
 # Local dev version
@@ -134,20 +125,33 @@ unset(PYTHON_ARGS)
 
 if(ENABLE_WORKBENCH)
   foreach(install_type conda;standalone)
-    # used by mantidworkbench
     if(${install_type} STREQUAL "conda")
-      set(LOCAL_PYPATH "\${CONDA_PREFIX}/bin:\${CONDA_PREFIX}/lib:\${CONDA_PREFIX}/plugins")
-      set(PYTHON_EXEC_LOCAL "\${CONDA_PREFIX}/bin/python")
+      set(ROOT_DIR "\${CONDA_PREFIX}")
       set(PREAMBLE "${CONDA_PREAMBLE_TEXT}")
       set(DEST_FILENAME_SUFFIX "")
+      # Don't need to set this for a conda environment
+      set(XKB_CONFIG_ROOT_COMMAND "")
     elseif(${install_type} STREQUAL "standalone")
-      set(LOCAL_PYPATH "\${INSTALLDIR}/bin:\${INSTALLDIR}/lib:\${INSTALLDIR}/plugins")
-      set(PYTHON_EXEC_LOCAL "\${INSTALLDIR}/bin/python")
+      set(ROOT_DIR "\${INSTALLDIR}")
       set(PREAMBLE "${SYS_PREAMBLE_TEXT}")
       set(DEST_FILENAME_SUFFIX ".standalone")
+      # Need to set this, otherwise stanalone won't launch on some linux distributions
+      set(XKB_CONFIG_ROOT_COMMAND "XKB_CONFIG_ROOT=\${INSTALLDIR}/share/X11/xkb")
     else()
       message(FATAL_ERROR "Unknown installation type '${install_type}' for workbench startup scripts")
     endif()
+
+    set(LOCAL_PYPATH "${ROOT_DIR}/bin:${ROOT_DIR}/lib:${ROOT_DIR}/plugins")
+    set(PYTHON_EXEC_LOCAL "${ROOT_DIR}/bin/python")
+    # Without specifying these schema files, the standalone can fail to launch on Linux. Inside a conda environment this
+    # environment variable is set by something else.
+    set(GSETTINGS_SCHEMA_DEFINITIONS
+        "# Specify path to schema files
+if [ -z \"\${GSETTINGS_SCHEMA_DIR}\" ]; then
+  GSETTINGS_MANTID_PATH=${ROOT_DIR}/share/glib-2.0/schemas
+fi"
+    )
+
     # workbench launcher for jemalloc
     configure_file(
       ${CMAKE_MODULE_PATH}/Packaging/launch_mantidworkbench.sh.in

buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in

@@ -23,6 +23,6 @@ fi
 LD_PRELOAD=${LOCAL_PRELOAD} \
     PYTHONPATH=${LOCAL_PYTHONPATH} @QT_QPA@ \
     GSETTINGS_SCHEMA_DIR=${GSETTINGS_SCHEMA_DIR}:${GSETTINGS_MANTID_PATH} \
-    XKB_CONFIG_ROOT=${INSTALLDIR}/share/X11/xkb \
+    @XKB_CONFIG_ROOT_COMMAND@ \
     @WRAPPER_PREFIX@$VGLRUN $GDB \
     @PYTHON_EXEC_LOCAL@@PYTHON_ARGS@ @MANTIDWORKBENCH_EXEC@ $SINGLEPROCESS "$@"@WRAPPER_POSTFIX@