HAYASHI Kentaro
null+****@clear*****
Thu Nov 15 19:06:46 JST 2012
HAYASHI Kentaro 2012-11-15 19:06:46 +0900 (Thu, 15 Nov 2012) New Revision: bd54e65e701f66a16b103704c1aef841e822ab99 https://github.com/mroonga/mroonga/commit/bd54e65e701f66a16b103704c1aef841e822ab99 Log: cmake: use MRN_SOURCE_DIR instead of CMAKE_SOURCE_DIR refs #1544 It is required to pass proper path for embedded storage engine. Modified files: CMakeLists.txt Modified: CMakeLists.txt (+15 -9) =================================================================== --- CMakeLists.txt 2012-11-12 19:14:52 +0900 (db22b97) +++ CMakeLists.txt 2012-11-15 19:06:46 +0900 (e939aa9) @@ -17,19 +17,25 @@ cmake_minimum_required(VERSION 2.6) project(mroonga) -file(READ ${CMAKE_SOURCE_DIR}/version MRN_VERSION) -file(READ ${CMAKE_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) -file(READ ${CMAKE_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) -file(READ ${CMAKE_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) -file(READ ${CMAKE_SOURCE_DIR}/version_in_hex MRN_VERSION_IN_HEX) -file(READ ${CMAKE_SOURCE_DIR}/plugin_version MRN_PLUGIN_VERSION) - -file(READ ${CMAKE_SOURCE_DIR}/required_groonga_version REQUIRED_GROONGA_VERSION) +if(WITH_MROONGA_STORAGE_ENGINE) + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}/storage/mroonga) +else() + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) +endif() + +file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) +file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) +file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) +file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) +file(READ ${MRN_SOURCE_DIR}/version_in_hex MRN_VERSION_IN_HEX) +file(READ ${MRN_SOURCE_DIR}/plugin_version MRN_PLUGIN_VERSION) + +file(READ ${MRN_SOURCE_DIR}/required_groonga_version REQUIRED_GROONGA_VERSION) string(STRIP "${REQUIRED_GROONGA_VERSION}" REQUIRED_GROONGA_VERSION) set(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}") -include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) +include(${MRN_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am MROONGA_SOURCES) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/lib/libmrn_no_mysql_sources.am -------------- next part -------------- HTML����������������������������...ダウンロード
