Skip to content

F
flatbuffers
Commit 520d6844 authored by Andrew Hundt's avatar Andrew Hundt Committed by Wouter van Oortmerssen
Browse files
Options

CMake now accepts external toolchain configuration (#4045) 

Resolves #4038
Related to https://github.com/ruslo/hunter/pull/529
parent b075b8c4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
CMakeLists.txt
View file @ 520d6844
...@@ -99,7 +99,10 @@ set(FlatBuffers_GRPCTest_SRCS ...@@ -99,7 +99,10 @@ set(FlatBuffers_GRPCTest_SRCS
# source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS}) # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
# source_group(Tests FILES ${FlatBuffers_Tests_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} -std=c++11 -stdlib=libc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra")
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment