From 39f7fad71d0a9fc72cab606ec1dfbd87dcda34ba Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 20 Jul 2016 14:24:50 +0200 Subject: [PATCH 1/2] fix duplicate clang block in cmake --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46c5b2e1d..c5514b221 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -315,14 +315,11 @@ else() endif() endif() set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized") - if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - set(WARNINGS "${WARNINGS} -Wno-deprecated-register") - endif() if(NOT MINGW) set(WARNINGS "${WARNINGS} -Werror") # to allow pedantic but not stop compilation endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - set(WARNINGS "${WARNINGS} -Wno-error=mismatched-tags -Wno-error=null-conversion -Wno-overloaded-shift-op-parentheses -Wno-error=shift-count-overflow -Wno-error=tautological-constant-out-of-range-compare -Wno-error=unused-private-field -Wno-error=unneeded-internal-declaration") + set(WARNINGS "${WARNINGS} -Wno-deprecated-register -Wno-error=mismatched-tags -Wno-error=null-conversion -Wno-overloaded-shift-op-parentheses -Wno-error=shift-count-overflow -Wno-error=tautological-constant-out-of-range-compare -Wno-error=unused-private-field -Wno-error=unneeded-internal-declaration") if(ARM6 OR ARM7) set(WARNINGS "${WARNINGS} -Wno-error=inline-asm") endif() From 48e14ef66c4ca9300a208f021a5d50142b245351 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 20 Jul 2016 14:25:59 +0200 Subject: [PATCH 2/2] fix atomic library to only fire off for clang --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5514b221..d421a8774 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,9 +462,11 @@ endif() list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS}) -if(NOT MINGW AND NOT APPLE) - find_library(ATOMIC atomic) - list(APPEND EXTRA_LIBRARIES ${ATOMIC}) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + if(NOT MINGW AND NOT APPLE) + find_library(ATOMIC atomic) + list(APPEND EXTRA_LIBRARIES ${ATOMIC}) + endif() endif() include(version.cmake)