Skip to content
Snippets Groups Projects
Commit 869e7351 authored by Bienchen's avatar Bienchen
Browse files

Merge branch 'master' into develop

parents e1f3b216 2df18821
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
CMakeLists.txt
+ 2
− 2
View file @ 869e7351
...@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) ...@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
project(OpenStructure CXX C) project(OpenStructure CXX C)
set (CMAKE_EXPORT_COMPILE_COMMANDS 1) set (CMAKE_EXPORT_COMPILE_COMMANDS 1)
set (OST_VERSION_MAJOR 1) set (OST_VERSION_MAJOR 1)
set (OST_VERSION_MINOR 4) set (OST_VERSION_MINOR 5)
set (OST_VERSION_PATCH 1) set (OST_VERSION_PATCH 0)
set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} ) set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} )
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support)
include(OST) include(OST)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment