Import 2017-06-07 23:51:09: master a74f8b44

Diff Back to Repository
Author Committer Branch Timestamp Parent
jcfr jcfr master 2014-09-24 15:36:11 master cc9188c2
Changeset

ENH: Refactor management of external project launcher settings.

This commit moves the definition of launcher setting into each external
projects.

The different type of setting (listed below) are passed to the the main
project (Slicer) using labels set using "mark_as_superbuild" function.

Type of settings and associated labels:

Build tree:

* LIBRARY_PATHS_LAUNCHER_BUILD
* PATHS_LAUNCHER_BUILD
* PYTHONPATH_LAUNCHER_BUILD
* ENVVARS_LAUNCHER_BUILD

Install tree:

* LIBRARY_PATHS_LAUNCHER_INSTALLED
* PYTHONPATH_LAUNCHER_INSTALLED
* PATHS_LAUNCHER_INSTALLED
* ENVVARS_LAUNCHER_INSTALLED

This patch has been tested on factory-win7, factory-south-ubuntu and
factory. The SlicerLauncherSetting.ini and SlicerLauncherSettingToInstall.ini
file have been compared with / without this patch and the file are
similar. The few differences are explained below:

  • nonexistent path are not configured anymore
  • on unix, following r23613, a new version of incrTcl is used and path
    have been updated to reflect this. Since there are to version of incrTcl
    (4.0.0 and 4.0.1), the path to "4.0.1" are considered.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23724 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerBlockCTKAppLauncherSettings.cmake Diff File
mod - SuperBuild/External_CTK.cmake Diff File
mod - SuperBuild/External_DCMTK.cmake Diff File
mod - SuperBuild/External_ITKv4.cmake Diff File
mod - SuperBuild/External_LibArchive.cmake Diff File
mod - SuperBuild/External_NUMPY.cmake Diff File
mod - SuperBuild/External_OpenIGTLink.cmake Diff File
mod - SuperBuild/External_OpenSSL.cmake Diff File
mod - SuperBuild/External_SimpleITK.cmake Diff File
mod - SuperBuild/External_SlicerExecutionModel.cmake Diff File
mod - SuperBuild/External_VTKv5.cmake Diff File
mod - SuperBuild/External_VTKv6.cmake Diff File
mod - SuperBuild/External_incrTcl.cmake Diff File
mod - SuperBuild/External_python.cmake Diff File
mod - SuperBuild/External_tcl.cmake Diff File
mod - SuperBuild/External_teem.cmake Diff File