Kouhei Sutou
null+****@clear*****
Wed Jun 26 16:26:10 JST 2013
Kouhei Sutou 2013-06-26 16:26:10 +0900 (Wed, 26 Jun 2013) New Revision: a78863153ad203963d04812d02ce80ffe1998310 https://github.com/groonga/groonga/commit/a78863153ad203963d04812d02ce80ffe1998310 Message: Revert "cmake: don't add CMAKE_INSTALL_PREFIX for mroonga bundled build" This reverts commit 591fc91f94d4707bfe162f3e1fb6c369c9455295. Because groonga should not consider about mroonga. Modified files: CMakeLists.txt Modified: CMakeLists.txt (+4 -14) =================================================================== --- CMakeLists.txt 2013-06-26 16:08:35 +0900 (ae7e61f) +++ CMakeLists.txt 2013-06-26 16:26:10 +0900 (3d5b249) @@ -44,14 +44,9 @@ set(LIB_DIR "lib") set(INCLUDE_DIR "include") set(GRN_INCLUDE_DIR "include/groonga") set(DATA_DIR "share") +set(GRN_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${GRN_PROJECT_NAME}") set(CONFIG_DIR "etc") -if (CMAKE_CURRENT_SOURCE_DIR MATCHES "mroonga/vendor/groonga$") - set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}") - set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}") -else() - set(GRN_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${GRN_PROJECT_NAME}") - set(GRN_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_DIR}/${GRN_PROJECT_NAME}") -endif() +set(GRN_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_DIR}/${GRN_PROJECT_NAME}") set(GRN_LOG_PATH "${CMAKE_INSTALL_PREFIX}/var/log/${GRN_PROJECT_NAME}/${GRN_PROJECT_NAME}.log" @@ -74,13 +69,8 @@ set(GRN_STACK_SIZE "DANGER!!! groonga stack size. Normarlly, you should not change this variable.") set(GRN_RELATIVE_PLUGINS_DIR "${GRN_PROJECT_NAME}/plugins") -if (CMAKE_CURRENT_SOURCE_DIR MATCHES "mroonga/vendor/groonga$") - set(GRN_PLUGINS_DIR - "${LIB_DIR}/${GRN_RELATIVE_PLUGINS_DIR}") -else() - set(GRN_PLUGINS_DIR - "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${GRN_RELATIVE_PLUGINS_DIR}") -endif() +set(GRN_PLUGINS_DIR + "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${GRN_RELATIVE_PLUGINS_DIR}") set(GRN_PLUGIN_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}") set(GRN_DLL_FILENAME "${CMAKE_SHARED_LIBRARY_PREFIX}groonga${CMAKE_SHARED_LIBRARY_SUFFIX}") -------------- next part -------------- HTML����������������������������...ダウンロード
