Skip to content

Commit 5ab60b4

Browse files
committed
MB-17253: Set VERSION to product version
The build process tried to determine the version from GIT, which failed on some systems. Set it to PRODUCT_VERSION instead. Change-Id: I41261b8464602ba0760ee2cbc1a380eb49c0fbc0 Reviewed-on: http://review.couchbase.org/58335 Tested-by: buildbot <[email protected]> Reviewed-by: Dave Rigby <[email protected]>
1 parent 6df29f9 commit 5ab60b4

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

CMakeLists.txt

-10
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,6 @@ CHECK_FUNCTION_EXISTS(getpagesizes HAVE_GETPAGESIZES)
173173

174174
SET(CONFLATE_DB_PATH ${CMAKE_INSTALL_PREFIX}/var/lib/moxi)
175175

176-
IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
177-
EXECUTE_PROCESS(COMMAND git describe
178-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
179-
OUTPUT_VARIABLE MOXI_VERSION
180-
ERROR_QUIET
181-
OUTPUT_STRIP_TRAILING_WHITESPACE)
182-
ELSE (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
183-
SET(MOXI_VERSION "unknown")
184-
ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
185-
186176
CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/src/config.cmake.h
187177
${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
188178

src/config.cmake.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ typedef long long int64_t;
124124
#define SASL_ENABLED
125125

126126
#define PACKAGE "moxi"
127-
#define VERSION "${MOXI_VERSION}"
127+
#define VERSION "${PRODUCT_VERSION}"
128128
#define CONFLATE_DB_PATH "${CONFLATE_DB_PATH}"
129129

130130
#include <event.h>

0 commit comments

Comments
 (0)