fix version number for release

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0a8dc8d1b3a1eb0bb8c3cf87c35647b4bb3b69f..d574bbdc7dca43137d1f1efe2c4d3195ecf7f0f0 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,8 +6,7 @@ SET(PROJECT_VERSION_MAJOR 1)
 SET(PROJECT_VERSION_MINOR 1)
 SET(PROJECT_VERSION_PATCH 6)
 
-OPTION(IMAGEMAGICK "without ImageMagick library" OFF)
-MESSAGE(STATUS "IMAGEMAGICK: " ${IMAGEMAGICK})
+SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 FIND_PACKAGE(Git)
 IF(GIT_FOUND)
@@ -19,13 +18,16 @@ IF(GIT_FOUND)
                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                OUTPUT_VARIABLE PROJECT_VERSION_TWEAK
                OUTPUT_STRIP_TRAILING_WHITESPACE)
-       if (NOT "${CURRENT_BRANCH}" STREQUAL "master")
+       IF(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
                SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK})
-       endif()
+       ENDIF()
 ENDIF()
 
 MESSAGE(STATUS "PROJECT_VERSION " ${PROJECT_VERSION})
 
+OPTION(IMAGEMAGICK "without ImageMagick library" OFF)
+MESSAGE(STATUS "IMAGEMAGICK: " ${IMAGEMAGICK})
+
 FIND_LIBRARY(SANE NAMES sane REQUIRED ONLY_CMAKE_FIND_ROOT_PATH)
 MESSAGE(STATUS "find sane: " ${SANE})
 FIND_LIBRARY(MATH NAMES m REQUIRED)