Kouhei Sutou
null+****@clear*****
Tue Feb 24 21:19:58 JST 2015
Kouhei Sutou 2015-02-24 21:19:58 +0900 (Tue, 24 Feb 2015) New Revision: 866e33c4b1498776cf70838609077eae2dc077df https://github.com/groonga/groonga/commit/866e33c4b1498776cf70838609077eae2dc077df Message: cmake: make fatal error for required MSVC isn't detected If Groonga is bundled in Mroonga, Groonga build is just skipped. Modified files: CMakeLists.txt Modified: CMakeLists.txt (+13 -2) =================================================================== --- CMakeLists.txt 2015-02-24 21:17:30 +0900 (99ecb2a) +++ CMakeLists.txt 2015-02-24 21:19:58 +0900 (3286f51) @@ -20,6 +20,12 @@ cmake_minimum_required(VERSION 2.6.2) set(GRN_PROJECT_NAME "groonga") project("${GRN_PROJECT_NAME}") +if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + set(GRN_BUNDLED FALSE) +else() + set(GRN_BUNDLED TRUE) +endif() + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_COMPILER_IS_CLANGC ON) endif() @@ -29,8 +35,13 @@ endif() if(MSVC) if(MSVC_VERSION LESS 1800) - message(STATUS "Groonga supports only MSVC 2013 or later") - return() + set(GRN_OLD_MSVC_MESSAGE "Groonga supports only MSVC 2013 or later") + if(GRN_BUNDLED) + message(STATUS ${GRN_OLD_MSVC_MESSAGE}) + return() + else() + message(FATAL_ERROR ${GRN_OLD_MSVC_MESSAGE}) + endif() endif() endif() -------------- next part -------------- HTML����������������������������...다운로드
