Skip to content

Commit

Permalink
Add more warnings via a special CMake target #29
Browse files Browse the repository at this point in the history
  • Loading branch information
hrabalik committed May 3, 2020
1 parent 56d3114 commit 317eaa3
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ else()
message(FATAL_ERROR "SIMDEE_INSTRUCTION_SET has an unexpected value")
endif()

# Add a target that supplies warning flags to depending targets
include(cmake/CompilerWarnings.cmake)
add_library(simdee-warnings INTERFACE)
target_set_strict_warnings(simdee-warnings)

# Build executables
if(SIMDEE_BUILD_TESTS)
add_subdirectory(test)
Expand Down
9 changes: 1 addition & 8 deletions bench/raybox/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
add_executable(simdee-raybox raybox.cpp)
target_link_libraries(simdee-raybox PRIVATE simdee)

# Enable strict warnings
if (MSVC)
target_compile_options(simdee-bench PRIVATE "/W4" "/WX")
else()
target_compile_options(simdee-bench PRIVATE "-Wall" "-Werror")
endif()
target_link_libraries(simdee-raybox PRIVATE simdee simdee-warnings)
87 changes: 87 additions & 0 deletions cmake/CompilerWarnings.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# credit: https://github.com/lefticus/cpp_starter_project

function(target_set_strict_warnings target_name)

set(MSVC_WARNINGS
/W4 # Baseline reasonable warnings
/w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss
# of data
/w14254 # 'operator': conversion from 'type1:field_bits' to
# 'type2:field_bits', possible loss of data
/w14263 # 'function': member function does not override any base class
# virtual member function
/w14265 # 'classname': class has virtual functions, but destructor is not
# virtual instances of this class may not be destructed correctly
/w14287 # 'operator': unsigned/negative constant mismatch
/we4289 # nonstandard extension used: 'variable': loop control variable
# declared in the for-loop is used outside the for-loop scope
/w14296 # 'operator': expression is always 'boolean_value'
/w14311 # 'variable': pointer truncation from 'type1' to 'type2'
/w14545 # expression before comma evaluates to a function which is missing
# an argument list
/w14546 # function call before comma missing argument list
/w14547 # 'operator': operator before comma has no effect; expected
# operator with side-effect
/w14549 # 'operator': operator before comma has no effect; did you intend
# 'operator'?
/w14555 # expression has no effect; expected expression with side- effect
/w14619 # pragma warning: there is no warning number 'number'
/w14640 # Enable warning on thread un-safe static member initialization
/w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may
# cause unexpected runtime behavior.
/w14905 # wide string literal cast to 'LPSTR'
/w14906 # string literal cast to 'LPWSTR'
/w14928 # illegal copy-initialization; more than one user-defined
# conversion has been implicitly applied
/permissive- # standards conformance mode for MSVC compiler.
)

set(CLANG_WARNINGS
-Wall
-Wextra # reasonable and standard
-Wshadow # 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
-Wpedantic # warn if non-standard C++ is used
-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)
)

set(CLANG_WARNINGS ${CLANG_WARNINGS} -Werror)
set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)

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
-Wuseless-cast # warn if you perform a cast to the same type
)

if(MSVC)
set(PROJECT_WARNINGS ${MSVC_WARNINGS})
elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
set(PROJECT_WARNINGS ${CLANG_WARNINGS})
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(PROJECT_WARNINGS ${GCC_WARNINGS})
else()
message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
endif()

target_compile_options(${target_name} INTERFACE ${PROJECT_WARNINGS})

endfunction()
9 changes: 1 addition & 8 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,7 @@ add_executable(simdee-test
${LIB_FILES_SIMD_VECTORS}
${LIB_FILES_UTIL}
)
target_link_libraries(simdee-test PRIVATE simdee)

# Enable strict warnings
if (MSVC)
target_compile_options(simdee-test PRIVATE "/W4" "/WX" "/MP")
else()
target_compile_options(simdee-test PRIVATE "-Wall" "-Werror")
endif()
target_link_libraries(simdee-test PRIVATE simdee simdee-warnings)

# Enable fast Catch compilation
target_compile_definitions(simdee-test PRIVATE "CATCH_CONFIG_FAST_COMPILE")
Expand Down

0 comments on commit 317eaa3

Please sign in to comment.