Import 2017-06-07 23:51:09: master 653f37d1

Diff Back to Repository
Author Committer Branch Timestamp Parent
jcfr jcfr master 2017-05-25 01:06:47 master 896b2988
Changeset

ENH: Add support for reading launcher setting using CTKAppLauncherLib

This commit introduces a dependency to the statically linked
library CTKAppLauncherLib

This library also used internally by the regular Slicer launcher allows
to read the launcher main settings and its associated revision specific
settings listing extensions paths.

Since on all platforms, environment variables are now consistently read
from settings files, this commit removes:

(1) the duplicated code path settings variables from the application
using methods like:

  • qSlicerCoreApplicationPrivate::setPythonEnvironmentVariables()
  • qSlicerCoreApplicationPrivate::setTclEnvironmentVariables()
  • qSlicerCoreApplicationPrivate::discoverITKFactoriesDirectory()
  • qSlicerCorePythonManager::pythonPaths()

(2) the application settings "Python/AdditionalPythonPaths" originally
introduced in r20852 (BUG: Ensure extension python paths are set on MacOSX)
to workaround the fact launcher settings were not used on MacOSX.

Finally, this commit also ensures that PYTHONPATH associated with thirdparty
libraries bundled in extension are considered on MacOSX. See Radiomics/SlicerRadiomics#18

[ci skip]

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26042 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/CMakeLists.txt Diff File
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCoreApplication_p.h Diff File
mod - Base/QTCore/qSlicerCorePythonManager.cxx Diff File
mod - Base/QTCore/qSlicerExtensionsManagerModel.cxx Diff File
mod - CMake/SlicerBlockCTKAppLauncherSettings.cmake Diff File
mod - CMake/SlicerMacroBuildApplication.cmake Diff File
mod - SuperBuild.cmake Diff File
add - SuperBuild/External_CTKAppLauncherLib.cmake Diff File
mod - SuperBuild/External_VTKv7.cmake Diff File