diff --git a/.gitsubprojects b/.gitsubprojects index 21b288a0bc030e72c0713ab3a136689b2d744cfe..bed78cb7920717f337edb4af5e286ba99779cfb7 100644 --- a/.gitsubprojects +++ b/.gitsubprojects @@ -3,6 +3,6 @@ # 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(neurolots https://github.com/gmrvvis/neurolots.git 5be6886 ) -git_subproject(ReTo https://github.com/gmrvvis/ReTo.git 94c5b0ee) +git_subproject(neurolots https://github.com/gmrvvis/neurolots.git fcab672a) +git_subproject(ReTo https://github.com/gmrvvis/ReTo.git 211c49a) git_subproject(acuterecorder https://github.com/vg-lab/AcuteRecorder.git 0b84c2b1) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c6b87f3f712f749c16494f56b99fc3e849cf3f6..0c4887d96364296adce936972ee76b40192a9889 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # cmake_minimum_required(VERSION 3.1 FATAL_ERROR) -project(NeuroTessMesh VERSION 0.3.1) +project(NeuroTessMesh VERSION 0.3.2) set(NeuroTessMesh_VERSION_ABI 1) # Disable in source building @@ -50,7 +50,6 @@ common_find_package(Qt5OpenGL 5.4 SYSTEM REQUIRED) common_find_package(Eigen3 SYSTEM REQUIRED) common_find_package(GLEW SYSTEM REQUIRED) common_find_package(neurolots REQUIRED) -common_find_package(ReTo REQUIRED) common_find_package(Lexis ${NEUROTESSMESH_OPTS_FIND_ARGS}) common_find_package(ZeroEQ ${NEUROTESSMESH_OPTS_FIND_ARGS}) common_find_package(gmrvlex ${NEUROTESSMESH_OPTS_FIND_ARGS}) @@ -58,7 +57,7 @@ common_find_package(GLUT SYSTEM) common_find_package(Boost COMPONENTS system filesystem SYSTEM) common_find_package( acuterecorder REQUIRED ) -list(APPEND NEUROTESSMESH_DEPENDENT_LIBRARIES Qt5Core Qt5Widget Qt5OpenGL GLEW neurolots ReTo acuterecorder) +list(APPEND NEUROTESSMESH_DEPENDENT_LIBRARIES Qt5Core Qt5Widget Qt5OpenGL GLEW neurolots acuterecorder) if ( ZEROEQ_FOUND ) common_find_package(Threads REQUIRED)