diff --git a/.gitexternals b/.gitexternals index ad260ac1ce9c9834cef2c80c7f332bdf2181c6cf..b5a29e368193303931edd4b0642c19dbd90253b6 100644 --- a/.gitexternals +++ b/.gitexternals @@ -1,2 +1,2 @@ # -*- mode: cmake -*- -# CMake/common https://github.com/Eyescale/CMake.git 5b8d588 +# CMake/common https://github.com/Eyescale/CMake.git 6721469 diff --git a/CMakeLists.txt b/CMakeLists.txt index 16bbffc67df95f287adf14bd6bd43b483accc524..114bacce4c691de36e02449c374fc1bcea88d2cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -set(visimpl_VERSION_ABI 1) +cmake_minimum_required(VERSION 2.8) +project(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 )