Merge pull request #919
48e14ef
fix atomic library to only fire off for clang (Riccardo Spagni)39f7fad
fix duplicate clang block in cmake (Riccardo Spagni)
This commit is contained in:
commit
c6c761c45c
|
@ -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()
|
||||
|
@ -465,9 +462,11 @@ endif()
|
|||
|
||||
list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
|
||||
|
||||
if(NOT MINGW AND NOT APPLE)
|
||||
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)
|
||||
|
|
Loading…
Reference in New Issue