Kouhei Sutou
null+****@clear*****
Tue Mar 10 14:27:42 JST 2015
Kouhei Sutou 2015-03-10 14:27:42 +0900 (Tue, 10 Mar 2015) New Revision: 9f2b967632cb9d433766e004528fc29088d7afee https://github.com/groonga/groonga/commit/9f2b967632cb9d433766e004528fc29088d7afee Message: cmake: don't use GRN_ prefix for internal variable Modified files: CMakeLists.txt vendor/mruby/CMakeLists.txt Modified: CMakeLists.txt (+1 -1) =================================================================== --- CMakeLists.txt 2015-03-10 12:44:18 +0900 (03977a9) +++ CMakeLists.txt 2015-03-10 14:27:42 +0900 (b915dea) @@ -529,7 +529,7 @@ else() set(GRN_WITH_MESSAGE_PACK FALSE) endif() -find_program(GRN_RUBY NAMES "ruby2.1" "ruby21" "ruby") +find_program(RUBY NAMES "ruby2.1" "ruby21" "ruby") option(GRN_WITH_MRUBY "use mruby" OFF) if(GRN_WITH_MRUBY) Modified: vendor/mruby/CMakeLists.txt (+1 -1) =================================================================== --- vendor/mruby/CMakeLists.txt 2015-03-10 12:44:18 +0900 (7b43b17) +++ vendor/mruby/CMakeLists.txt 2015-03-10 14:27:42 +0900 (ee28b5b) @@ -40,7 +40,7 @@ if(GRN_WITH_MRUBY) if(NOT EXISTS "${mruby_build_timestamp}") execute_process( COMMAND - "${GRN_RUBY}" + "${RUBY}" "${CMAKE_CURRENT_SOURCE_DIR}/mruby_build.rb" "${CMAKE_CURRENT_SOURCE_DIR}/build_config.rb" "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source" -------------- next part -------------- HTML����������������������������...Download
