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

Author Committer Branch Timestamp Parent
jcfr jcfr master 2015-06-16 15:45:01 master c132a382
Changeset

COMP: Update Slicer, CTK and BRAINSTools to fix outdated builds on VS2012

High-level build did not build external projects in VS2012. The BUILD_ALWAYS flag is a relatively new CMake feature (added in 3.1), therefore the following workaround was added into SuperBuild.cmake:

This custom external project step forces the build and later

steps to run whenever a top level build is done...

ExternalProject_Add_Step(${proj} forcebuild
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BINARY_DIR}/Slicer-prefix/src/Slicer-stamp/Slicer-build
COMMENT "Forcing build step for '${proj}'"
DEPENDEES build
ALWAYS 1
)

This does not work with Visual Studio, where the stamp file is in Debug/Release/etc. subdirectory:
${CMAKE_CURRENT_BINARY_DIR}/Slicer-prefix/src/Slicer-stamp/${CMAKE_CFG_INTDIR}/Slicer-build

Co-authored-by:

// ----------------
Update CTK to integrate similar fix:

git shortlog fd3a2b1..9e5af26 --no-merges
Andras Lasso (1):
Fixed outdated builds on VS2012

Andreas Fetzer (1):
Update ctk user password for central.xnat.org, which was expired

Sascha Zelzer (1):
Provide an explicit resolve operation for plug-ins.

// ----------------
Update BRAINSTools to integrate similar fix:

$ git shortlog 0dd3268..30f43a7 --no-merges
Andras Lasso (1):
COMP: Fixed outdated builds on VS2012

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24309 3bd1e089-480b-0410-8dfb-8563597acbee

mod - SuperBuild.cmake Diff File
mod - SuperBuild/External_CTK.cmake Diff File