null+****@clear*****
null+****@clear*****
2012年 5月 17日 (木) 22:02:28 JST
Kouhei Sutou 2012-05-17 22:02:28 +0900 (Thu, 17 May 2012)
New Revision: 859a5b2f94c8a2ce85244c473278c29c970ac81c
Log:
cmake windows: define missing GRN_DLL_FILENAME
Modified files:
CMakeLists.txt
config.h.cmake
Modified: CMakeLists.txt (+4 -0)
===================================================================
--- CMakeLists.txt 2012-05-17 21:56:38 +0900 (369007b)
+++ CMakeLists.txt 2012-05-17 22:02:28 +0900 (245af39)
@@ -61,6 +61,10 @@ set(GRN_PLUGINS_DIR
"${LIB_DIR}/${GRN_RELATIVE_PLUGINS_DIR}"
CACHE PATH "groonga plugins' directory")
set(GRN_PLUGIN_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}")
+set(GRN_DLL_FILENAME "${CMAKE_SHARED_MODULE_SUFFIX}")
+AC_SUBST(GRN_DLL_FILENAME
+ "${CMAKE_SHARED_LIBRARY_PREFIXF}groonga${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ CACHE PATH "groonga DLL filename")
add_definitions(
-DHAVE_CONFIG_H
Modified: config.h.cmake (+2 -0)
===================================================================
--- config.h.cmake 2012-05-17 21:56:38 +0900 (38d2309)
+++ config.h.cmake 2012-05-17 22:02:28 +0900 (f3ca97d)
@@ -33,6 +33,8 @@
#define GRN_PLUGINS_DIR "${GRN_PLUGINS_DIR}"
#define GRN_PLUGIN_SUFFIX "${GRN_PLUGIN_SUFFIX}"
+#define GRN_DLL_FILENAME "${GRN_DLL_FILENAME}"
+
/* build switches */
#cmakedefine USE_MEMORY_DEBUG
#cmakedefine USE_MAP_HUGETLB