Skip to content
Snippets Groups Projects
Commit d6e9d9f0 authored by Felix de las Pozas's avatar Felix de las Pozas
Browse files

Merge branch 'win-build-fix' into 'master'

Win build fix

See merge request nsviz/NeuroTessMesh!18
parents 5b6cfc3b b4fe4a94
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
# git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 1e66ee3) # git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 1e66ee3)
# git_subproject(Lexis https://github.com/HBPVis/Lexis.git 617eedb) # git_subproject(Lexis https://github.com/HBPVis/Lexis.git 617eedb)
# git_subproject(gmrvlex git@gitlab.gmrv.es:nsviz/gmrvlex.git c20b194) # git_subproject(gmrvlex git@gitlab.gmrv.es:nsviz/gmrvlex.git c20b194)
git_subproject(neurolots https://github.com/gmrvvis/neurolots.git 5be6886 ) git_subproject(neurolots https://github.com/gmrvvis/neurolots.git fcab672a)
git_subproject(ReTo https://github.com/gmrvvis/ReTo.git 94c5b0ee) git_subproject(ReTo https://github.com/gmrvvis/ReTo.git 211c49a)
git_subproject(acuterecorder https://github.com/vg-lab/AcuteRecorder.git 0b84c2b1) git_subproject(acuterecorder https://github.com/vg-lab/AcuteRecorder.git 0b84c2b1)
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
cmake_minimum_required(VERSION 3.1 FATAL_ERROR) 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) set(NeuroTessMesh_VERSION_ABI 1)
# Disable in source building # Disable in source building
...@@ -50,7 +50,6 @@ common_find_package(Qt5OpenGL 5.4 SYSTEM REQUIRED) ...@@ -50,7 +50,6 @@ common_find_package(Qt5OpenGL 5.4 SYSTEM REQUIRED)
common_find_package(Eigen3 SYSTEM REQUIRED) common_find_package(Eigen3 SYSTEM REQUIRED)
common_find_package(GLEW SYSTEM REQUIRED) common_find_package(GLEW SYSTEM REQUIRED)
common_find_package(neurolots REQUIRED) common_find_package(neurolots REQUIRED)
common_find_package(ReTo REQUIRED)
common_find_package(Lexis ${NEUROTESSMESH_OPTS_FIND_ARGS}) common_find_package(Lexis ${NEUROTESSMESH_OPTS_FIND_ARGS})
common_find_package(ZeroEQ ${NEUROTESSMESH_OPTS_FIND_ARGS}) common_find_package(ZeroEQ ${NEUROTESSMESH_OPTS_FIND_ARGS})
common_find_package(gmrvlex ${NEUROTESSMESH_OPTS_FIND_ARGS}) common_find_package(gmrvlex ${NEUROTESSMESH_OPTS_FIND_ARGS})
...@@ -58,7 +57,7 @@ common_find_package(GLUT SYSTEM) ...@@ -58,7 +57,7 @@ common_find_package(GLUT SYSTEM)
common_find_package(Boost COMPONENTS system filesystem SYSTEM) common_find_package(Boost COMPONENTS system filesystem SYSTEM)
common_find_package( acuterecorder REQUIRED ) 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 ) if ( ZEROEQ_FOUND )
common_find_package(Threads REQUIRED) common_find_package(Threads REQUIRED)
......
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