null+****@clear*****
null+****@clear*****
2012年 4月 16日 (月) 22:12:01 JST
Kouhei Sutou 2012-04-16 22:12:01 +0900 (Mon, 16 Apr 2012)
New Revision: b36794141184651a3d4516a67c06658ec7ea189e
Log:
cmake: fix VERSION and GRN_VERSION content
VERSION -> 2.0.2
GRN_VERSION -> 2.0.1-270-gbf9eecb
Modified files:
CMakeLists.txt
config.h.cmake
Modified: CMakeLists.txt (+10 -1)
===================================================================
--- CMakeLists.txt 2012-04-16 17:52:02 +0900 (5eba843)
+++ CMakeLists.txt 2012-04-16 22:12:01 +0900 (74e8237)
@@ -16,7 +16,16 @@
cmake_minimum_required(VERSION 2.6)
project(groonga)
-file(READ base_version GRN_VERSION)
+file(READ "${CMAKE_SOURCE_DIR}/base_version" VERSION)
+if(EXISTS "${CMAKE_SOURCE_DIR}/version.sh")
+ file(READ "${CMAKE_SOURCE_DIR}/version.sh" GRN_VERSION)
+else()
+ if(NOT EXISTS "${CMAKE_BINARY_DIR}/version.sh")
+ execute_process(COMMAND "${CMAKE_SOURCE_DIR}/version-gen.sh")
+ endif()
+ file(READ "${CMAKE_BINARY_DIR}/version.sh" GRN_VERSION)
+endif()
+string(REGEX REPLACE "(^.*=|\n)" "" GRN_VERSION "${GRN_VERSION}")
include(CheckIncludeFile)
include(CheckFunctionExists)
Modified: config.h.cmake (+4 -4)
===================================================================
--- config.h.cmake 2012-04-16 17:52:02 +0900 (686413f)
+++ config.h.cmake 2012-04-16 22:12:01 +0900 (be3f00c)
@@ -6,13 +6,13 @@
#define HOST_CPU "${CMAKE_HOST_SYSTEM_PROCESSOR}"
#define HOST_OS "${CMAKE_HOST_SYSTEM_NAME}"
-#define VERSION "${GRN_VERSION}"
+#define VERSION "${VERSION}"
#define PACKAGE "${PROJECT_NAME}"
#define PACKAGE_NAME "${PROJECT_NAME}"
-#define PACKAGE_STRING "${PROJECT_NAME} ${GRN_VERSION}"
-#define PACKAGE_TARNAME "${PACKAGE_TARNAME}"
+#define PACKAGE_STRING "${PROJECT_NAME} ${VERSION}"
+#define PACKAGE_TARNAME "${PROJECT_NAME}"
#define PACKAGE_URL "${PACKAGE_URL}"
-#define PACKAGE_VERSION "${GRN_VERSION}"
+#define PACKAGE_VERSION "${VERSION}"
/* groonga related constants */
#define GRN_CONFIG_PATH "${GRN_CONFIG_PATH}"