null+****@clear*****
null+****@clear*****
2012年 5月 17日 (木) 21:50:25 JST
Kouhei Sutou 2012-05-17 21:50:25 +0900 (Thu, 17 May 2012)
New Revision: 63f687298b4c78c6303cd7b394e4a1f2b8347c40
Log:
cmake windows: define missing GRN_RELATIVE_PLUGINS_DIR
Modified files:
CMakeLists.txt
config.h.cmake
Modified: CMakeLists.txt (+4 -1)
===================================================================
--- CMakeLists.txt 2012-05-17 21:45:37 +0900 (8856999)
+++ CMakeLists.txt 2012-05-17 21:50:25 +0900 (369007b)
@@ -54,8 +54,11 @@ set(GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT
set(GRN_DEFAULT_DOCUMENT_ROOT
"${GRN_DATA_DIR}/${GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT}"
CACHE PATH "groonga default document root")
+set(GRN_RELATIVE_PLUGINS_DIR
+ "${CMAKE_PROJECT_NAME}/plugins"
+ CACHE PATH "groonga plugins' relative directory")
set(GRN_PLUGINS_DIR
- "${LIB_DIR}/${CMAKE_PROJECT_NAME}/plugins"
+ "${LIB_DIR}/${GRN_RELATIVE_PLUGINS_DIR}"
CACHE PATH "groonga plugins' directory")
set(GRN_PLUGIN_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}")
Modified: config.h.cmake (+2 -0)
===================================================================
--- config.h.cmake 2012-05-17 21:45:37 +0900 (be3f00c)
+++ config.h.cmake 2012-05-17 21:50:25 +0900 (38d2309)
@@ -28,6 +28,8 @@
#define GRN_DEFAULT_DOCUMENT_ROOT \
"${GRN_DEFAULT_DOCUMENT_ROOT}"
+#define GRN_RELATIVE_PLUGINS_DIR \
+ "${GRN_RELATIVE_PLUGINS_DIR}"
#define GRN_PLUGINS_DIR "${GRN_PLUGINS_DIR}"
#define GRN_PLUGIN_SUFFIX "${GRN_PLUGIN_SUFFIX}"