Move CMake code for enabling warnings into separate module and function
This commit is contained in:
parent
d9eb99fca1
commit
c48816b243
|
|
@ -84,6 +84,7 @@ set(CMAKE_MODULE_FILES
|
|||
cmake/modules/Doxygen.cmake
|
||||
cmake/modules/ListToString.cmake
|
||||
cmake/modules/ShellCompletion.cmake
|
||||
cmake/modules/DevelUtilities.cmake
|
||||
cmake/modules/3rdParty.cmake)
|
||||
set(CMAKE_TEMPLATE_FILES
|
||||
cmake/templates/bash-completion.sh.in
|
||||
|
|
|
|||
|
|
@ -94,8 +94,7 @@ if (NOT DEFINED META_QT_DEFAULT_PLUGINS)
|
|||
set(META_QT_DEFAULT_PLUGINS 0) # needs to be exactly 0, Qt's code uses STREQUAL 0
|
||||
endif ()
|
||||
|
||||
# add option to enable defaults useful for development
|
||||
option(ENABLE_DEVEL_DEFAULTS "enable build system options useful during development by default" OFF)
|
||||
include(DevelUtilities)
|
||||
|
||||
# find standard installation directories - note: Allow overriding CMAKE_INSTALL_LIBDIR and LIB_INSTALL_DIR but don't use the
|
||||
# default from GNUInstallDirs (as an Arch Linux user this feels odd and I also want to avoid breaking existing build
|
||||
|
|
@ -684,53 +683,6 @@ else ()
|
|||
endforeach ()
|
||||
endif ()
|
||||
|
||||
# enable useful warnings and explicitly disable not useful ones and treat warnings them as errors
|
||||
option(ENABLE_WARNINGS "adds additional compiler flags to enable useful warnings" "${ENABLE_DEVEL_DEFAULTS}")
|
||||
set(CLANG_WARNINGS
|
||||
-Wall
|
||||
-Wextra # reasonable and standard
|
||||
-Wshadow=local # warn the user if a variable declaration shadows one from a parent context
|
||||
-Wnon-virtual-dtor # warn the user if a class with virtual functions has a non-virtual destructor. This helps catch hard
|
||||
# to track down memory errors
|
||||
-Wold-style-cast # warn for c-style casts
|
||||
-Wcast-align # warn for potential performance problem casts
|
||||
-Wunused # warn on anything being unused
|
||||
-Woverloaded-virtual # warn if you overload (not override) a virtual function
|
||||
-Wconversion # warn on type conversions that may lose data
|
||||
-Wsign-conversion # warn on sign conversions
|
||||
-Wnull-dereference # warn if a null dereference is detected
|
||||
-Wdouble-promotion # warn if float is implicit promoted to double
|
||||
-Wformat=2 # warn on security issues around functions that format output (ie printf)
|
||||
-Wno-pedantic # warn NOT if non-standard C++ is used (some vendor extensions are very useful)
|
||||
-Wno-missing-field-initializers # warn NOT about missing field initializers
|
||||
-Wno-useless-cast # warn NOT about useless cases (this is sometimes very useful in templates)
|
||||
-Wno-unused-const-variable # warn NOT about unused constants (usually used in other compile unit)
|
||||
-Wno-unknown-warning-option # warn NOT about unknown warning options (depending on compiler/version not all are
|
||||
# available)
|
||||
)
|
||||
set(GCC_WARNINGS
|
||||
${CLANG_WARNINGS}
|
||||
-Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist
|
||||
-Wduplicated-cond # warn if if / else chain has duplicated conditions
|
||||
-Wduplicated-branches # warn if if / else branches have duplicated code
|
||||
-Wlogical-op # warn about logical operations being used where bitwise were probably wanted
|
||||
)
|
||||
if (ENABLE_WARNINGS)
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
|
||||
list(APPEND META_PRIVATE_COMPILE_OPTIONS ${CLANG_WARNINGS})
|
||||
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
list(APPEND META_PRIVATE_COMPILE_OPTIONS ${GCC_WARNINGS})
|
||||
else ()
|
||||
message(AUTHOR_WARNING "Enabling warnings is not supported for compiler '${CMAKE_CXX_COMPILER_ID}'.")
|
||||
endif ()
|
||||
endif ()
|
||||
option(TREAT_WARNINGS_AS_ERRORS "adds additional compiler flag to treat warnings as errors" "${ENABLE_DEVEL_DEFAULTS}")
|
||||
if (TREAT_WARNINGS_AS_ERRORS)
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
list(APPEND META_PRIVATE_COMPILE_OPTIONS -Werror)
|
||||
else ()
|
||||
message(AUTHOR_WARNING "Treating warnings as errors is not supported for compiler '${CMAKE_CXX_COMPILER_ID}'.")
|
||||
endif ()
|
||||
endif ()
|
||||
configure_development_warnings(APPEND_OUTPUT_VAR META_PRIVATE_COMPILE_OPTIONS)
|
||||
|
||||
set(BASIC_PROJECT_CONFIG_DONE YES)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,83 @@
|
|||
cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR)
|
||||
|
||||
# prevent multiple inclusion
|
||||
if (DEFINED DEVEL_UTILITIES_LOADED)
|
||||
return()
|
||||
endif ()
|
||||
set(DEVEL_UTILITIES_LOADED YES)
|
||||
|
||||
# add option to enable defaults useful for development
|
||||
option(ENABLE_DEVEL_DEFAULTS "enable build system options useful during development by default" OFF)
|
||||
|
||||
function (configure_development_warnings)
|
||||
# parse arguments
|
||||
set(OPTIONAL_ARGS)
|
||||
set(ONE_VALUE_ARGS TARGET OUTPUT_VAR APPEND_OUTPUT_VAR)
|
||||
set(MULTI_VALUE_ARGS)
|
||||
cmake_parse_arguments(ARGS "${OPTIONAL_ARGS}" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
|
||||
|
||||
# enable useful warnings and explicitly disable not useful ones and treat warnings as errors
|
||||
option(ENABLE_WARNINGS "adds additional compiler flags to enable useful warnings" "${ENABLE_DEVEL_DEFAULTS}")
|
||||
set(CLANG_WARNINGS
|
||||
-Wall
|
||||
-Wextra # reasonable and standard
|
||||
-Wshadow=local # warn the user if a variable declaration shadows one from a parent context
|
||||
-Wnon-virtual-dtor # warn the user if a class with virtual functions has a non-virtual destructor. This helps catch
|
||||
# hard to track down memory errors
|
||||
-Wold-style-cast # warn for c-style casts
|
||||
-Wcast-align # warn for potential performance problem casts
|
||||
-Wunused # warn on anything being unused
|
||||
-Woverloaded-virtual # warn if you overload (not override) a virtual function
|
||||
-Wconversion # warn on type conversions that may lose data
|
||||
-Wsign-conversion # warn on sign conversions
|
||||
-Wnull-dereference # warn if a null dereference is detected
|
||||
-Wdouble-promotion # warn if float is implicit promoted to double
|
||||
-Wformat=2 # warn on security issues around functions that format output (ie printf)
|
||||
-Wno-pedantic # warn NOT if non-standard C++ is used (some vendor extensions are very useful)
|
||||
-Wno-missing-field-initializers # warn NOT about missing field initializers
|
||||
-Wno-useless-cast # warn NOT about useless cases (this is sometimes very useful in templates)
|
||||
-Wno-unused-const-variable # warn NOT about unused constants (usually used in other compile unit)
|
||||
-Wno-unknown-warning-option # warn NOT about unknown warning options (depending on compiler/version not all are
|
||||
# available)
|
||||
)
|
||||
set(GCC_WARNINGS
|
||||
${CLANG_WARNINGS}
|
||||
-Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist
|
||||
-Wduplicated-cond # warn if if / else chain has duplicated conditions
|
||||
-Wduplicated-branches # warn if if / else branches have duplicated code
|
||||
-Wlogical-op # warn about logical operations being used where bitwise were probably wanted
|
||||
)
|
||||
if (ENABLE_WARNINGS)
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
|
||||
list(APPEND COMPILE_OPTIONS_TO_CONFIGURE ${CLANG_WARNINGS})
|
||||
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
list(APPEND COMPILE_OPTIONS_TO_CONFIGURE ${GCC_WARNINGS})
|
||||
else ()
|
||||
message(AUTHOR_WARNING "Enabling warnings is not supported for compiler '${CMAKE_CXX_COMPILER_ID}'.")
|
||||
endif ()
|
||||
endif ()
|
||||
option(TREAT_WARNINGS_AS_ERRORS "adds additional compiler flag to treat warnings as errors" "${ENABLE_DEVEL_DEFAULTS}")
|
||||
if (TREAT_WARNINGS_AS_ERRORS)
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
list(APPEND COMPILE_OPTIONS_TO_CONFIGURE -Werror)
|
||||
else ()
|
||||
message(AUTHOR_WARNING "Treating warnings as errors is not supported for compiler '${CMAKE_CXX_COMPILER_ID}'.")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
# set compile options / set output variable
|
||||
if (ARGS_TARGET)
|
||||
target_compile_options("${ARGS_TARGET}" PRIVATE ${COMPILE_OPTIONS_TO_CONFIGURE})
|
||||
endif ()
|
||||
if (ARGS_OUTPUT_VAR)
|
||||
set("${ARGS_OUTPUT_VAR}"
|
||||
${COMPILE_OPTIONS_TO_CONFIGURE}
|
||||
PARENT_SCOPE)
|
||||
endif ()
|
||||
if (ARGS_APPEND_OUTPUT_VAR)
|
||||
set("${ARGS_APPEND_OUTPUT_VAR}"
|
||||
${${ARGS_APPEND_OUTPUT_VAR}} ${COMPILE_OPTIONS_TO_CONFIGURE}
|
||||
PARENT_SCOPE)
|
||||
endif ()
|
||||
|
||||
endfunction ()
|
||||
Loading…
Reference in New Issue