Commit 18fc4b7c authored by Pablo Toharia's avatar Pablo Toharia

Updated cmake/common and some tags. TODO: update rest of projects.

parent 253a4495
# -*- mode: cmake -*-
# CMake/common https://github.com/Eyescale/CMake.git 6721469
# CMake/common https://github.com/Eyescale/CMake.git 1dc7a32
# -*- mode: cmake -*-
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 9455489)
git_subproject(zeq https://github.com/HBPVIS/zeq de2915f)
git_subproject(Deflect https://github.com/BlueBrain/Deflect 18cf0d9)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git d26906e)
git_subproject(Brion https://github.com/BlueBrain/Brion.git 5c2ef23)
git_subproject(BBPSDK git@gitlab.gmrv.es:bbp/bbpsdk.git 472e945 )
git_subproject(gmrvzeq git@gitlab.gmrv.es:nsviz/gmrvzeq.git 5043fad)
git_subproject(fires git@gitlab.gmrv.es:retrieval/fires.git c2b4d62)
git_subproject(nsol git@gitlab.gmrv.es:nsviz/nsol.git b49f71a)
git_subproject(nore git@gitlab.gmrv.es:nsviz/nore.git 23c57b9)
git_subproject(neuroscheme git@gitlab.gmrv.es:nsviz/neuroscheme.git 5f00b12)
git_subproject(prefr git@gitlab.gmrv.es:nsviz/prefr.git 60f1c612)
git_subproject(neurolots git@gitlab.gmrv.es:nsviz/neurolots.git 46c4ca8)
git_subproject(spineret git@gitlab.gmrv.es:retrieval/spineret.git da86cd7)
git_subproject(strip git@gitlab.gmrv.es:gmrv/strip.git 8381f8d)
git_subproject(visimpl git@gitlab.gmrv.es:gmrv/demoSimPrefr.git f0b1c981)
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 10d93e6)
git_subproject(zeq https://github.com/HBPVIS/ZeroEQ b79a43a)
git_subproject(Deflect https://github.com/BlueBrain/Deflect 785812c)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git b990d7f)
git_subproject(Brion https://github.com/BlueBrain/Brion.git aead60c)
#git_subproject(BBPSDK git@gitlab.gmrv.es:bbp/bbpsdk.git 472e945 )
#git_subproject(gmrvzeq git@gitlab.gmrv.es:nsviz/gmrvzeq.git 5043fad)
git_subproject(fires git@gitlab.gmrv.es:retrieval/fires.git b007eee)
git_subproject(nsol git@gitlab.gmrv.es:nsviz/nsol.git a4558a9)
git_subproject(nore git@gitlab.gmrv.es:nsviz/nore.git 7bdc5a1)
git_subproject(neuroscheme git@gitlab.gmrv.es:nsviz/neuroscheme.git 04f8192)
# git_subproject(prefr git@gitlab.gmrv.es:nsviz/prefr.git 60f1c612)
# git_subproject(neurolots git@gitlab.gmrv.es:nsviz/neurolots.git 46c4ca8)
# git_subproject(spineret git@gitlab.gmrv.es:retrieval/spineret.git da86cd7)
# git_subproject(strip git@gitlab.gmrv.es:gmrv/strip.git 8381f8d)
# git_subproject(visimpl git@gitlab.gmrv.es:gmrv/demoSimPrefr.git f0b1c981)
......@@ -23,6 +23,9 @@
# when only a specific branch of a repo is required and the full history
# is not required. Note that the SHALLOW option will only work for a branch
# or tag and cannot be used for an arbitrary SHA.
# OPTIONAL, when present, this option makes this operation optional.
# The function will output a warning and return if the repo could not be
# cloned.
#
# Targets:
# * <directory>-rebase: fetches latest updates and rebases the given external
......@@ -30,7 +33,7 @@
# * rebase: Rebases all git externals, including sub projects
#
# Options (global) which control behaviour:
# GIT_EXTERNAL_VERBOSE
# COMMON_GIT_EXTERNAL_VERBOSE
# This is a global option which has the same effect as the VERBOSE option,
# with the difference that output information will be produced for all
# external repos when set.
......@@ -53,7 +56,7 @@ if(NOT GIT_EXECUTABLE)
endif()
include(CMakeParseArguments)
option(GIT_EXTERNAL_VERBOSE "Print git commands as they are executed" OFF)
option(COMMON_GIT_EXTERNAL_VERBOSE "Print git commands as they are executed" OFF)
if(NOT GITHUB_USER AND DEFINED ENV{GITHUB_USER})
set(GITHUB_USER $ENV{GITHUB_USER} CACHE STRING
......@@ -61,7 +64,7 @@ if(NOT GITHUB_USER AND DEFINED ENV{GITHUB_USER})
endif()
macro(GIT_EXTERNAL_MESSAGE msg)
if(GIT_EXTERNAL_VERBOSE OR GIT_EXTERNAL_LOCAL_VERBOSE)
if(COMMON_GIT_EXTERNAL_VERBOSE)
message(STATUS "${NAME}: ${msg}")
endif()
endmacro()
......@@ -74,7 +77,7 @@ function(JOIN VALUES GLUE OUTPUT)
endfunction()
function(GIT_EXTERNAL DIR REPO tag)
cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;SHALLOW" "" "RESET" ${ARGN})
cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;SHALLOW;OPTIONAL" "" "RESET" ${ARGN})
set(TAG ${tag})
if(GIT_EXTERNAL_TAG AND "${tag}" MATCHES "^[0-9a-f]+$")
set(TAG ${GIT_EXTERNAL_TAG})
......@@ -115,7 +118,12 @@ function(GIT_EXTERNAL DIR REPO tag)
RESULT_VARIABLE nok ERROR_VARIABLE error
WORKING_DIRECTORY "${GIT_EXTERNAL_DIR}")
if(nok)
message(FATAL_ERROR "${DIR} clone failed: ${error}\n")
if(GIT_EXTERNAL_LOCAL_OPTIONAL)
message(STATUS "${DIR} clone failed: ${error}\n")
return()
else()
message(FATAL_ERROR "${DIR} clone failed: ${error}\n")
endif()
endif()
# checkout requested tag
......
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