null+****@clear*****
null+****@clear*****
2012年 4月 13日 (金) 12:40:28 JST
Kouhei Sutou 2012-04-13 12:40:28 +0900 (Fri, 13 Apr 2012)
New Revision: 0173fec00e88d2ba239893f9915e369718039e01
Log:
cmake: add missing declarations for building groonga command
Modified files:
CMakeLists.txt
config.h.cmake
Modified: CMakeLists.txt (+6 -0)
===================================================================
--- CMakeLists.txt 2012-04-13 11:20:25 +0900 (eafe7d4)
+++ CMakeLists.txt 2012-04-13 12:40:28 +0900 (1458e4f)
@@ -26,6 +26,12 @@ set(GRN_LOG_PATH
set(GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD
0
CACHE STRING "groonga default match escalation threshold")
+set(GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT
+ "html/admin"
+ CACHE PATH "groonga default relative document root")
+set(GRN_DEFAULT_DOCUMENT_ROOT
+ "${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/${GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT}"
+ CACHE PATH "groonga default document root")
set(GRN_PLUGINS_DIR
"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/plugins"
CACHE PATH "groonga plugins' directory")
Modified: config.h.cmake (+5 -3)
===================================================================
--- config.h.cmake 2012-04-13 11:20:25 +0900 (2ae0238)
+++ config.h.cmake 2012-04-13 12:40:28 +0900 (3bbc19f)
@@ -11,6 +11,8 @@
#define GRN_DEFAULT_DB_KEY "${GRN_DEFAULT_DB_KEY}"
#define GRN_DEFAULT_ENCODING "${GRN_DEFAULT_ENCODING}"
#define GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD ${GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD}
+#define GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT "${GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT}"
+#define GRN_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}"
#define GRN_PLUGINS_DIR "${GRN_PLUGINS_DIR}"
#define GRN_PLUGIN_SUFFIX "${GRN_PLUGIN_SUFFIX}"
@@ -73,12 +75,12 @@
#cmakedefine NO_ZLIB
#define PACKAGE "${PROJECT_NAME}"
-#cmakedefine PACKAGE_NAME
+#define PACKAGE_NAME "${PROJECT_NAME}"
#cmakedefine PACKAGE_STRING
#cmakedefine PACKAGE_TARNAME
#cmakedefine PACKAGE_URL
-#cmakedefine PACKAGE_VERSION
-#define VERSION "${VERSION}"
+#define PACKAGE_VERSION "${GRN_VERSION}"
+#define VERSION "${GRN_VERSION}"
#cmakedefine STDC_HEADERS
#cmakedefine USE_AIO