Commit e4ec2442 authored by T.J. Corona's avatar T.J. Corona Committed by Kitware Robot

Merge topic 'default-smtk-from-git'

3a8c0f73 If cmb is in developer mode and smtk is "from_cmb", warn and use git
5ad5d4e5 By default, use smtk acquired from git
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson's avatarDavid Thompson <david.thompson@kitware.com>
Merge-request: !466
parents c0310881 3a8c0f73
......@@ -145,8 +145,9 @@ function (superbuild_sanity_check)
smtk_SOURCE_SELECTION STREQUAL "from_cmb" AND
NOT DEVELOPER_MODE_smtk AND
(NOT cmb_enabled OR DEVELOPER_MODE_cmb))
message(FATAL_ERROR
"SMTK cannot use CMB's SMTK submodule without CMB being enabled and built by the superbuild.")
message(WARNING
"SMTK cannot use CMB's SMTK submodule without CMB being enabled and built by the superbuild. Pulling SMTK from git instead")
set(smtk_SOURCE_SELECTION "git" CACHE STRING "smtk source selection" FORCE)
endif ()
endfunction ()
......
......@@ -43,10 +43,10 @@ superbuild_set_selectable_source(smtk
SELECT 2.0.0
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG "v2.0.0"
SELECT git CUSTOMIZABLE
SELECT git CUSTOMIZABLE DEFAULT
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG "origin/master"
SELECT from_cmb DEFAULT
SELECT from_cmb
DOWNLOAD_COMMAND
"${CMAKE_COMMAND}" -E echo_append
SOURCE_DIR "${smtk_source_dir}/thirdparty/smtk"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment