Differential D14212 Diff 38619 plugins/astyle/3rdparty/libastyle/CMakeLists.txt

Changeset View

Standalone View

View Options

plugins/astyle/3rdparty/libastyle/CMakeLists.txt

1set(astylelib_SRCS 1​set(astylelib_SRCS
2 ASBeautifier.cpp 2​ ASBeautifier.cpp
3 ASEnhancer.cpp 3​ ASEnhancer.cpp
4 ASFormatter.cpp 4​ ASFormatter.cpp
5 ASResource.cpp 5​ ASResource.cpp
6 ASLocalizer.cpp 6​ ASLocalizer.cpp
7) 7​)
8add_library(astylelib STATIC ${astylelib_SRCS}) 8​add_library(astylelib STATIC ${astylelib_SRCS})
9set_property(TARGET astylelib PROPERTY POSITION_INDEPENDENT_CODE ON) 9​set_property(TARGET astylelib PROPERTY POSITION_INDEPENDENT_CODE ON)
10​
10if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") 11​if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
aaronpuchertUnsubmitted
Not Done

Maybe you can remember in add_compile_flag_if_supported if a warning flag was enabled and check that here? That would seem more consistent to me.

aaronpuchert: Maybe you can remember in `add_compile_flag_if_supported` if a warning flag was enabled and…
kossebauAuthorUnsubmitted
Not Done

Agreed, had the same idea. Though for now I was lazy and just copied the approach done for the -Wdocumentation flag. Left that improvement though for a latter separate patch, until the flag addition in general are accepted.

kossebau: Agreed, had the same idea. Though for now I was lazy and just copied the approach done for the…
kossebauAuthorUnsubmitted
Not Done

After I had experimentally added support for -Winconsistent-missing-override and its inversion, I found being able to drop any version checks would be nice to have already now, so went and extended the macro side of things.

As I am not sure if one can rely on the "no-" version to be present for a flag, I simply have gone to propose testing the actual flag to be used to be present, so we are on the safe side.

kossebau: After I had experimentally added support for -Winconsistent-missing-override and its inversion…
11 # astyle lib throws lots of warnings with -Wdocumentation 12​ # astyle lib throws lots of warnings with -Wdocumentation
12 target_compile_options(astylelib PRIVATE "-Wno-documentation") 13​ add_target_compile_flag_if_supported(astylelib PRIVATE "-Wno-documentation")
13endif() 14​endif()
15​if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
16​ add_target_compile_flag_if_supported(astylelib PRIVATE "-Wno-zero-as-null-pointer-constant")
17​endif()
18​if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
19​ add_target_compile_flag_if_supported(astylelib PRIVATE "-Wno-suggest-override")
20​endif()
21​# add as SYSTEM include dir so compiler does not emit warnings for the lib headers
22​target_include_directories(astylelib SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})