Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SimVisSuite
visimpl
Commits
3923cecc
Commit
3923cecc
authored
May 25, 2016
by
Sergio Galindo
Browse files
Fixed compilation error derived from premature CMake common update.
parent
8be21492
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitexternals
View file @
3923cecc
# -*- mode: cmake -*-
# CMake/common https://github.com/Eyescale/CMake.git
5b8d588
# CMake/common https://github.com/Eyescale/CMake.git
6721469
CMakeLists.txt
View file @
3923cecc
...
...
@@ -4,11 +4,10 @@
# sergio.galindo@urjc.es
#
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
cmake_minimum_required
(
VERSION 3.1 FATAL_ERROR
)
# ViSimpl project and version
project
(
visimpl
VERSION
0.1.0
)
se
t
(
visimpl
_VERSION_ABI 1
)
cmake_minimum_required
(
VERSION
2.8
)
projec
t
(
visimpl
)
# Disable in source building
if
(
"
${
PROJECT_SOURCE_DIR
}
"
STREQUAL
"
${
PROJECT_BINARY_DIR
}
"
)
...
...
@@ -28,6 +27,12 @@ endif()
include
(
GitExternal
)
set
(
LAST_RELEASE 0.0.0
)
set
(
VERSION_MAJOR
"0"
)
set
(
VERSION_MINOR
"1"
)
set
(
VERSION_PATCH
"0"
)
set
(
VERSION_ABI 1
)
# description
set
(
VISIMPL_DESCRIPTION
"Visimpl"
)
set
(
COMMON_PROJECT_DOMAIN gmrv.es
)
...
...
@@ -37,19 +42,19 @@ include(Common)
option
(
VISIMPL_WITH_ZEQ
"VISIMPL_WITH_ZEQ"
ON
)
option
(
VISIMPL_WITH_GMRVZEQ
"VISIMPL_WITH_GMRVZEQ"
ON
)
common_
find_
package
(
Qt5Core 5.4 REQUIRED
)
common_
find_
package
(
Qt5Gui 5.4 REQUIRED
)
common_
find_
package
(
Qt5Widgets 5.4 REQUIRED
)
common_
find_
package
(
Qt5OpenGL REQUIRED
)
common_
find_
package
(
GLEW REQUIRED SYSTEM
)
# common_
find_
package( GLUT REQUIRED SYSTEM )
common_
find_
package
(
OpenGL REQUIRED
)
common_
find_
package
(
Eigen3 REQUIRED SYSTEM
)
common_
find_
package
(
nsol REQUIRED
)
common_
find_
package
(
neurolots REQUIRED
)
common_
find_
package
(
prefr REQUIRED
)
common_
find_
package
(
Brion REQUIRED
)
common_
find_
package
(
HDF5 REQUIRED COMPONENTS C CXX
)
common_package
(
Qt5Core 5.4 REQUIRED
)
common_package
(
Qt5Gui 5.4 REQUIRED
)
common_package
(
Qt5Widgets 5.4 REQUIRED
)
common_package
(
Qt5OpenGL REQUIRED
)
common_package
(
GLEW REQUIRED SYSTEM
)
# common_package( GLUT REQUIRED SYSTEM )
common_package
(
OpenGL REQUIRED
)
common_package
(
Eigen3 REQUIRED SYSTEM
)
common_package
(
nsol REQUIRED
)
common_package
(
neurolots REQUIRED
)
common_package
(
prefr REQUIRED
)
common_package
(
Brion REQUIRED
)
common_package
(
HDF5 REQUIRED COMPONENTS C CXX
)
list
(
APPEND VISIMPL_DEPENDENT_LIBRARIES
OpenGL
...
...
@@ -74,21 +79,21 @@ if (QT5OPENGL_FOUND)
endif
(
)
if
(
VISIMPL_WITH_ZEQ
)
common_
find_
package
(
zeq
)
common_package
(
zeq
)
if
(
ZEQ_FOUND
)
list
(
APPEND VISIMPL_DEPENDENT_LIBRARIES zeq
)
common_
find_
package
(
Threads REQUIRED
)
common_package
(
Threads REQUIRED
)
list
(
APPEND VISIMPL_DEPENDENT_LIBRARIES Threads
)
endif
(
)
if
(
VISIMPL_WITH_GMRVZEQ
)
common_find_package
(
gmrvzeq
)
if
(
GMRVZEQ_FOUND
)
list
(
APPEND VISIMPL_DEPENDENT_LIBRARIES gmrvzeq
)
if
(
VISIMPL_WITH_GMRVZEQ
)
common_package
(
gmrvzeq
)
if
(
GMRVZEQ_FOUND
)
list
(
APPEND VISIMPL_DEPENDENT_LIBRARIES gmrvzeq
)
endif
(
)
endif
(
)
endif
(
)
common_find_package_post
()
common_package_post
()
add_subdirectory
(
sumrice
)
add_subdirectory
(
visimpl
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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