From 92c40964426b9f34eb297123c221762df34c1add Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Mon, 25 Jan 2016 18:33:52 +0200 Subject: cmake: Fixed version name Signed-off-by: Stefan Andritoiu --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index cf87c900..b0e74018 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_ # Make a version file containing the current version from git. include (GetGitRevisionDescription) git_describe (VERSION "--tags") + if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND") message (WARNING " - Install git to compile a production libtinyb!") set (VERSION "v0.1.0-dirty") @@ -47,7 +48,7 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/version.c.in set (tinyb_VERSION_MAJOR ${VERSION_MAJOR}) set (tinyb_VERSION_MINOR ${VERSION_MINOR}) set (tinyb_VERSION_PATCH ${VERSION_PATCH}) -set (tinyb_VERSION_STRING ${mraa_VERSION_MAJOR}.${mraa_VERSION_MINOR}.${mraa_VERSION_PATCH}) +set (tinyb_VERSION_STRING "${tinyb_VERSION_MAJOR}.${tinyb_VERSION_MINOR}.${tinyb_VERSION_PATCH}") set (CMAKE_SWIG_FLAGS "") -- cgit v1.2.3