Skip to content
Snippets Groups Projects
Commit d8b11a2f authored by Pablo Toharia's avatar Pablo Toharia
Browse files

Changed gmrvvis to vglab.

parent 2511d415
No related branches found
No related tags found
No related merge requests found
set -e
rm -rf .ciscript
git clone https://gitlab.gmrv.es/common/ciscript.git .ciscript
git clone https://gitlab.vglab.es/common/ciscript.git .ciscript
bash .ciscript/gitlabci.sh
......@@ -17,7 +17,7 @@ Ubuntu-Optional-Deps:
Ubuntu-Optional-Deps-master-tags:
stage: build
script:
- export APPIMAGE_REPO="gitlabci@gmrv.es:apps"
- export APPIMAGE_REPO="gitlabci@vglab.es:apps"
- export APPIMAGE_ICON="neuroscheme/icons/ns_icon.png"
- export CMAKE_EXTRA_TARGETS="install"
- export BUILD_OPTIONALS_SUBPROJECTS=1
......@@ -35,7 +35,7 @@ Ubuntu-Optional-Deps-master:
stage: build
script:
- export APP_VERSION="git-master"
- export APPIMAGE_REPO="gitlabci@gmrv.es:apps"
- export APPIMAGE_REPO="gitlabci@vglab.es:apps"
- export APPIMAGE_ICON="neuroscheme/icons/ns_icon.png"
- export CMAKE_EXTRA_TARGETS="install"
- export BUILD_OPTIONALS_SUBPROJECTS=1
......@@ -65,7 +65,7 @@ Ubuntu-Subproject-master:
script:
- export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON"
- export BUILD_GENERATOR="Ninja"
- export GITHUB_MIRROR_URL="git@github.com:gmrvvis/NeuroScheme"
- export GITHUB_MIRROR_URL="git@github.com:vg-lab/NeuroScheme"
- bash .gitlab-ci.sh
only:
- master
......@@ -75,7 +75,7 @@ Ubuntu-Subproject-master:
OSX-Optional-Deps-master-tags:
stage: build
script:
- export DMGAPP_REPO="gitlabci@gmrv.es:apps"
- export DMGAPP_REPO="gitlabci@vglab.es:apps"
- module load Qt-5.9.1
- export BUILD_OPTIONALS_SUBPROJECTS=1
- export CMAKE_EXTRA_ARGS="-DNEUROSCHEME_OPTIONALS_AS_REQUIRED=ON -DLibJpegTurbo_INCLUDE_DIR=/usr/local/opt/jpeg-turbo/include -DLibJpegTurbo_LIBRARY=/usr/local/opt/jpeg-turbo/lib/libturbojpeg.dylib -DCLONE_SUBPROJECTS=ON"
......@@ -93,7 +93,7 @@ OSX-Optional-Deps-master:
stage: build
script:
- export APP_VERSION="git-master"
- export DMGAPP_REPO="gitlabci@gmrv.es:apps"
- export DMGAPP_REPO="gitlabci@vglab.es:apps"
- module load Qt-5.9.1
- export BUILD_OPTIONALS_SUBPROJECTS=1
- export CMAKE_EXTRA_ARGS="-DNEUROSCHEME_OPTIONALS_AS_REQUIRED=ON -DLibJpegTurbo_INCLUDE_DIR=/usr/local/opt/jpeg-turbo/include -DLibJpegTurbo_LIBRARY=/usr/local/opt/jpeg-turbo/lib/libturbojpeg.dylib -DCLONE_SUBPROJECTS=ON"
......@@ -150,7 +150,7 @@ Win7-Subproject-vs14:
Win7-Subproject-vs14-master-tags:
stage: build
script:
- set WINAPP_REPO=gitlabci@gmrv.es:apps
- set WINAPP_REPO=gitlabci@vglab.es:apps
- call %ENVFILESDIR%\Boost-1.64-vs14-x64.bat
- call %ENVFILESDIR%\Qt-5.9-vs14.bat
- call %ENVFILESDIR%\eigen-3.1.2-vs12-x64.bat
......@@ -169,7 +169,7 @@ Win7-Subproject-vs14-master:
stage: build
script:
- set APP_VERSION=git-master
- set WINAPP_REPO=gitlabci@gmrv.es:apps
- set WINAPP_REPO=gitlabci@vglab.es:apps
- call %ENVFILESDIR%\Boost-1.64-vs14-x64.bat
- call %ENVFILESDIR%\Qt-5.9-vs14.bat
- call %ENVFILESDIR%\eigen-3.1.2-vs12-x64.bat
......
......@@ -3,4 +3,4 @@
url = https://github.com/Eyescale/CMake
[submodule "deps/silo"]
path = deps/silo
url = https://gitlab.gmrv.es/gmrv/silo.git
url = https://gitlab.vglab.es/gmrv/silo.git
......@@ -2,7 +2,7 @@
#git_subproject(Brion https://github.com/BlueBrain/Brion.git f74dcc5)
#git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 1e66ee3)
#git_subproject(Lexis https://github.com/HBPVis/Lexis.git 617eedb)
#git_subproject(gmrvlex git@gitlab.gmrv.es:nsviz/gmrvlex.git c20b194)
git_subproject(ShiFT https://github.com/gmrvvis/shift 90e534ef)
git_subproject(scoop https://github.com/gmrvvis/scoop cc02a23)
#git_subproject(nsol https://github.com/gmrvvis/nsol 872fe14f)
#git_subproject(gmrvlex git@gitlab.vglab.es:nsviz/gmrvlex.git c20b194)
git_subproject(ShiFT https://github.com/vg-lab/shift 90e534ef)
git_subproject(scoop https://github.com/vg-lab/scoop cc02a23)
#git_subproject(nsol https://github.com/vg-lab/nsol 872fe14f)
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# NeuroScheme
# 2015-2019 (c) GMRV / URJC / UPM
# 2015-2020 (c) VGLAB / GMRV / URJC / UPM
# gmrv@gmrv.es
# www.vglab.es
# www.gmrv.es
#
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
......@@ -52,7 +53,7 @@ endif()
set( NEUROSCHEME_DESCRIPTION "NeuroScheme" )
set( NEUROSCHEME_MAINTAINER "Pablo Toharia <pablo.toharia@upm.es>")
set( NEUROSCHEME_LICENSE LGPL)
set( COMMON_PROJECT_DOMAIN gmrv.es )
set( COMMON_PROJECT_DOMAIN vglab.es )
include( Common )
......
......@@ -39,7 +39,7 @@ command can be used:
There are binaries for x64 architecture for GNU/Linux, MS Windows and MacOSX
available for download in
[http://gmrv.es/gmrvvis/apps/NeuroScheme/](http://gmrv.es/gmrvvis/apps/NeuroScheme/)
[http://vglab.es/apps/NeuroScheme/](http://vglab.es/apps/NeuroScheme/)
## Building from source
......@@ -48,7 +48,7 @@ Yosemite/Sierra and Windows 7/8/10 Visual Studio 2015 Win64. The following steps
enough to build it just with the required dependencies.
```bash
git clone --recursive https://github.com/gmrvvis/NeuroScheme
git clone --recursive https://github.com/vg-lab/NeuroScheme
mkdir NeuroScheme/build && cd NeuroScheme/build
cmake .. -DCLONE_SUBPROJECTS=ON -DCMAKE_BUILD_TYPE=Release
make
......
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