CMake now accepts external toolchain configuration (#4045)

Resolves #4038 Related to https://github.com/ruslo/hunter/pull/529

CMake now accepts external toolchain configuration (#4045)
Resolves #4038 Related to https://github.com/ruslo/hunter/pull/529
520d6844 · Andrew Hundt · Wouter van Oortmerssen · b075b8c4 · 520d6844
Commit 520d6844 authored Oct 05, 2016 by Andrew Hundt Committed by Wouter van Oortmerssen Oct 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +4 -1

No files found.
--- 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)