From 54377222999d6a81deb3b8504719d6cfbcdfc469 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Wed, 26 Apr 2017 11:59:20 -0500 Subject: [PATCH] Fix compilation on Clang 4+ --- CMakeLists.txt | 4 ++++ libraries/fc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df908b8e..ff140883 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,6 +129,10 @@ else( WIN32 ) # Apple AND Linux if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp" ) + elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) + if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3 ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" ) + endif() endif() if( "${CMAKE_GENERATOR}" STREQUAL "Ninja" ) diff --git a/libraries/fc b/libraries/fc index 6d386e44..91af0e7e 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 6d386e442b57f4da6099ebd934e071a73d46f398 +Subproject commit 91af0e7edbec0e37d38efff78c5644f9ba8aedd7