Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
T.J. Corona
CMB-SuperBuild
Commits
aa1f9194
Commit
aa1f9194
authored
Jan 10, 2019
by
T.J. Corona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the default smtk/cmb versions to 3.0.0/6.0.0
parent
6726dfa7
Pipeline
#127404
running with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CMakeLists.txt
CMakeLists.txt
+2
-2
versions.cmake
versions.cmake
+4
-4
No files found.
CMakeLists.txt
View file @
aa1f9194
...
...
@@ -11,7 +11,7 @@ macro (superbuild_setup_variables)
if
(
cmb_SOURCE_SELECTION STREQUAL
"git"
)
# Assuming master; just use the latest version, but let the user set their
# own version in case it is actually a branch from some other version.
set
(
CMB_VERSION_DEFAULT
"6.0.0
-rc2
"
set
(
CMB_VERSION_DEFAULT
"6.0.0"
CACHE STRING
"The default version of CMB to use if it cannot be detected"
)
mark_as_advanced
(
CMB_VERSION_DEFAULT
)
set
(
cmb_default_version
"
${
CMB_VERSION_DEFAULT
}
"
)
...
...
@@ -29,7 +29,7 @@ macro (superbuild_setup_variables)
if
(
smtk_SOURCE_SELECTION STREQUAL
"git"
OR smtk_SOURCE_SELECTION STREQUAL
"from_cmb"
)
# Assuming master; just use the latest version, but let the user set their
# own version in case it is actually a branch from some other version.
set
(
SMTK_VERSION_DEFAULT
"3.0.0
-rc2
"
set
(
SMTK_VERSION_DEFAULT
"3.0.0"
CACHE STRING
"The default version of SMTK to use if it cannot be detected"
)
mark_as_advanced
(
SMTK_VERSION_DEFAULT
)
set
(
smtk_default_version
"
${
SMTK_VERSION_DEFAULT
}
"
)
...
...
versions.cmake
View file @
aa1f9194
...
...
@@ -18,9 +18,9 @@ superbuild_set_revision(vtkonly
GIT_TAG origin/master
)
superbuild_set_selectable_source
(
cmb
SELECT
5
.0.0
SELECT
6
.0.0
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/cmb.git"
GIT_TAG
"v
5
.0.0"
GIT_TAG
"v
6
.0.0"
SELECT git CUSTOMIZABLE DEFAULT
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/cmb.git"
GIT_TAG
"origin/master"
...
...
@@ -40,9 +40,9 @@ else ()
endif
()
superbuild_set_selectable_source
(
smtk
SELECT
2
.0.0
SELECT
3
.0.0
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG
"v
2
.0.0"
GIT_TAG
"v
3
.0.0"
SELECT git CUSTOMIZABLE DEFAULT
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG
"origin/master"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment