Differential D16894 Diff 50589 kde-modules/KDECompilerSettings.cmake

Changeset View

Standalone View

View Options

kde-modules/KDECompilerSettings.cmake

Show First 20 Lines • Show All 180 Lines • ▼ Show 20 Line(s)
181endif() 181​endif()
182 182​
183 183​
184 184​
185############################################################ 185​############################################################
186# Language and toolchain features 186​# Language and toolchain features
187############################################################ 187​############################################################
188 188​
189​include(ECMAddCompilerFlag)
190​
189# Pick sensible versions of the C and C++ standards. 191​# Pick sensible versions of the C and C++ standards.
190# Note that MSVC does not have equivalent flags; the features are either 192​# Note that MSVC does not have equivalent flags; the features are either
191# supported or they are not. 193​# supported or they are not.
192if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang") 194​if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
193 # We use the C89 standard because that is what is common to all our 195​ # We use the C89 standard because that is what is common to all our
apolUnsubmitted
Not Done

Why can't we just use check_cxx_compiler_flag?

apol: Why can't we just use check_cxx_compiler_flag?
rjvbbAuthorUnsubmitted
Not Done

We could of course. I worked under the assumption that is not done currently because checking only ID+version is faster. CMake's check_cxx_compiler_flag is more expensive because it invokes the compiler.

And it can fail, for instance if the user adds an option for which the compiler emits diagnostics output. That will be true for the "clang on Mac" situation too, but why generalise brittleness if you don't have to?

rjvbb: We could of course. I worked under the assumption that is not done currently because checking…
194 # compilers (in particular, MSVC 2010 does not support C99) 196​ # compilers (in particular, MSVC 2010 does not support C99)
195 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990") 197​ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990")
196endif() 198​endif()
197if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") 199​if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
198 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") 200​ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
199elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32) 201​elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)
200 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") 202​ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
kfunkUnsubmitted
Not Done

This "let's abuse ${ARGN} as code to be evaluated later" is pretty ugly. The previous version (with the if-statements at the caller side) is way more clean and understandable.

kfunk: This "let's abuse ${ARGN} as code to be evaluated later" is pretty ugly. The previous version…
201endif() 203​endif()
apolUnsubmitted
Not Done

Why have a macro that only works on Apple?

apol: Why have a macro that only works on Apple?
rjvbbAuthorUnsubmitted
Not Done

? This is a macro that encapsulates a Mac-specific peculiarity but otherwise should work everywhere. Did I miss something?!

NB: ${_RESULT} is not going to be set if COMPILER_OK isn't set first, meaning the macro should always "return false" when a flag isn't supported, even if check_cxx_compiler_flag isn't used.

rjvbb: ? This is a macro that encapsulates a Mac-specific peculiarity but otherwise should work…
kfunkUnsubmitted
Not Done

I don't really understand why this branch is needed. The macro name name suggests it does the compile check on all compilers. Again very misleading.

kfunk: I don't really understand why this branch is needed. The macro name name suggests it does the…
202 204​
203# Do not merge uninitialized global variables. 205​# Do not merge uninitialized global variables.
204# This is mostly a "principle of least surprise" thing, but also 206​# This is mostly a "principle of least surprise" thing, but also
205# has performance benefits. 207​# has performance benefits.
206# See https://www.ibm.com/developerworks/community/blogs/zTPF/entry/benefits_of_the_fnocommon_compile_option_peter_lemieszewski?lang=en 208​# See https://www.ibm.com/developerworks/community/blogs/zTPF/entry/benefits_of_the_fnocommon_compile_option_peter_lemieszewski?lang=en
207# Note that this only applies to C code; C++ already behaves like this. 209​# Note that this only applies to C code; C++ already behaves like this.
208if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR 210​if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
209 CMAKE_C_COMPILER_ID MATCHES "Clang" OR 211​ CMAKE_C_COMPILER_ID MATCHES "Clang" OR
▲ Show 20 Lines • Show All 154 Lines • ▼ Show 20 Line(s)364if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
364 # Make some warnings errors 366​ # Make some warnings errors
365 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration") 367​ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
366endif() 368​endif()
367if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") 369​if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
368 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_KDE_GCC_COMMON_WARNING_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") 370​ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_KDE_GCC_COMMON_WARNING_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
369 # Make some warnings errors 371​ # Make some warnings errors
370 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type") 372​ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
371endif() 373​endif()
372if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR 374​ecm_add_cxx_compiler_flags_if_supported(FLAGS -Wvla
373 (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)) 375​ SUPPORTED_IF CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
374 # -Wvla: use of variable-length arrays (an extension to C++) 376​ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
375 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wvla") 377​ QUERY_IF APPLE)
376endif() 378​ecm_add_cxx_compiler_flags_if_supported(FLAGS -Wdate-time
377if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR 379​ SUPPORTED_IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR
378 (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)) 380​ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
379 include(CheckCXXCompilerFlag) 381​ QUERY_IF APPLE)
380 check_cxx_compiler_flag(-Wdate-time HAVE_DATE_TIME) ​
381 if (HAVE_DATE_TIME) ​
382 # -Wdate-time: warn if we use __DATE__ or __TIME__ (we want to be able to reproduce the exact same binary) ​
383 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdate-time") ​
384 endif() ​
385endif() ​
386 382​
387if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") 383​if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
388 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0") 384​ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
389 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override -Wlogical-op" ) 385​ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override -Wlogical-op" )
390 endif() 386​ endif()
391endif() 387​endif()
392 388​
393# -w1 turns on warnings and errors 389​# -w1 turns on warnings and errors
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)481if (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
487 # "otherwise undefined symbol in phononcore.dll errors occurs", with the commit 483​ # "otherwise undefined symbol in phononcore.dll errors occurs", with the commit
488 # message "set linker flag --export-all-symbols for all targets, otherwise 484​ # message "set linker flag --export-all-symbols for all targets, otherwise
489 # some depending targets could not be build" 485​ # some depending targets could not be build"
490 # FIXME: do our export macros not deal with this properly? 486​ # FIXME: do our export macros not deal with this properly?
491 set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols") 487​ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols")
492 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols") 488​ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols")
493endif() 489​endif()
494 490​
495if (CMAKE_GENERATOR STREQUAL "Ninja" AND 491​if (CMAKE_GENERATOR STREQUAL "Ninja")
496 ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR ​
497 (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) ​
498 # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support. 492​ # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support.
499 # Rationale in https://github.com/ninja-build/ninja/issues/814 493​ # Rationale in https://github.com/ninja-build/ninja/issues/814
500 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") 494​ ecm_add_cxx_compiler_flags_if_supported(FLAGS -fdiagnostics-color=always
495​ SUPPORTED_IF ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR
496​ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))
497​ QUERY_IF APPLE)
501endif() 498​endif()
502 499​
503include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake") 500​include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
504include("${ECM_MODULE_DIR}/ECMCoverageOption.cmake") 501​include("${ECM_MODULE_DIR}/ECMCoverageOption.cmake")