From 520d68449f2fd1692f5ca187cf1cf561429a348d Mon Sep 17 00:00:00 2001 From: Andrew Hundt Date: Wed, 5 Oct 2016 16:20:30 -0400 Subject: [PATCH] CMake now accepts external toolchain configuration (#4045) Resolves #4038 Related to https://github.com/ruslo/hunter/pull/529 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad01c211a..29e021806 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,10 @@ set(FlatBuffers_GRPCTest_SRCS # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS}) # source_group(Tests FILES ${FlatBuffers_Tests_SRCS}) -if(APPLE) +if(EXISTS "${CMAKE_TOOLCHAIN_FILE}") + # do not apply any global settings if the toolchain + # is being configured externally +elseif(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra") elseif(CMAKE_COMPILER_IS_GNUCXX)