From aeaec4acdd671fcd1cfef5876912381e44ca62ff Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 7 Jun 2018 16:39:19 +0200
Subject: Fix version numbers for release, snapshot and Git checkouts

---
 libcrystfel/CMakeLists.txt    | 2 +-
 libcrystfel/config.h.cmake.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt
index 1fba6624..568dd2b3 100644
--- a/libcrystfel/CMakeLists.txt
+++ b/libcrystfel/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(libcrystfel VERSION ${CRYSTFEL_VERSION} LANGUAGES C)
+project(libcrystfel VERSION ${CRYSTFEL_SHORT_VERSION} LANGUAGES C)
 
 find_package(Curses)
 find_package(FFTW)
diff --git a/libcrystfel/config.h.cmake.in b/libcrystfel/config.h.cmake.in
index 36bbba60..ba332bec 100644
--- a/libcrystfel/config.h.cmake.in
+++ b/libcrystfel/config.h.cmake.in
@@ -16,4 +16,4 @@
 #cmakedefine HAVE_CBF_CBF_H
 #cmakedefine HAVE_CBFLIB_CBF_H
 
-#define CRYSTFEL_VERSIONSTRING "${PROJECT_VERSION}+${GIT_SHA1}"
+#define CRYSTFEL_VERSIONSTRING "${CRYSTFEL_VERSION}"
-- 
cgit v1.2.3