From 156a30c75335958440e8315e0877cfdb86b80167 Mon Sep 17 00:00:00 2001 From: Rafal Kapuscik <54976862+rkapuscik@users.noreply.github.com> Date: Wed, 8 Sep 2021 22:14:53 +0200 Subject: [PATCH] Move Apple-specific build flags to Clang section (#6802) This allows building FlatBuffers with gcc on macOS: - avoid linking libc++ when not using clang - look at compiler first, then OS-specific options Signed-off-by: Rafal Kapuscik --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f0a0fc06..8fe54a275 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,10 +220,6 @@ if(EXISTS "${CMAKE_TOOLCHAIN_FILE}") # do not apply any global settings if the toolchain # is being configured externally message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.") -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 -Wno-unused-parameter") - set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast") elseif(CMAKE_COMPILER_IS_GNUCXX) if(CYGWIN) set(CMAKE_CXX_FLAGS @@ -250,8 +246,13 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) "${CMAKE_CXX_FLAGS} -fsigned-char") elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Wno-unused-parameter") + if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + endif() + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Wno-unused-parameter") set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast") if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8) list(APPEND FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wimplicit-fallthrough" "-Wextra-semi" "-Werror=unused-private-field") # enable warning