Navigation Menu

Skip to content

Commit

Permalink
Revert "cmake: don't add CMAKE_INSTALL_PREFIX for mroonga bundled build"
Browse files Browse the repository at this point in the history
This reverts commit 591fc91.

Because groonga should not consider about mroonga.
  • Loading branch information
kou committed Jun 26, 2013
1 parent 591fc91 commit a788631
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions CMakeLists.txt
Expand Up @@ -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"
Expand All @@ -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}")
Expand Down

0 comments on commit a788631

Please sign in to comment.