Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
aeva
CMB-Superbuild
Commits
04f77394
Commit
04f77394
authored
Jan 02, 2018
by
Bob Obara
Browse files
Merge branch 'fixingBranches' into 'release'
BUG: Fixing CMB and SMTK Settings See merge request
cmb/cmb-superbuild!384
parents
260d3149
29c79ec8
Changes
1
Hide whitespace changes
Inline
Side-by-side
versions.cmake
View file @
04f77394
...
...
@@ -25,12 +25,12 @@ superbuild_set_revision(shiboken
URL_MD5 53e71b32964b5daf38b45e1679623e48
)
superbuild_set_selectable_source
(
cmb
SELECT
4.2
.0
SELECT
5.0
.0
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/cmb.git"
GIT_TAG
"v
4.2
.0"
GIT_TAG
"v
5.0
.0"
SELECT git CUSTOMIZABLE DEFAULT
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/cmb.git"
GIT_TAG
"origin/
master
"
GIT_TAG
"origin/
release
"
SELECT source CUSTOMIZABLE
SOURCE_DIR
"source-cmb"
)
...
...
@@ -47,12 +47,12 @@ else ()
endif
()
superbuild_set_selectable_source
(
smtk
SELECT
1.1
.0
SELECT
2.0
.0
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG
"v
1.1
.0"
GIT_TAG
"v
2.0
.0"
SELECT git CUSTOMIZABLE
GIT_REPOSITORY
"https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG
"origin/
master
"
GIT_TAG
"origin/
release
"
SELECT from_cmb DEFAULT
DOWNLOAD_COMMAND
"
${
CMAKE_COMMAND
}
"
-E echo_append
...
...
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