mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-25 18:11:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1503 from Glamhoth/warnings_as_option

Browse Source 
Added an option to disable compiler warnings
This commit is contained in:
Gabi Melman 2020-04-03 20:32:38 +03:00 committed by GitHub
commit 58629f1fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -79,6 +79,9 @@ option(SPDLOG_BUILD_BENCH "Build benchmarks (Requires https://github.com/google/
# sanitizer options # sanitizer options
option(SPDLOG_SANITIZE_ADDRESS "Enable address sanitizer in tests" OFF) option(SPDLOG_SANITIZE_ADDRESS "Enable address sanitizer in tests" OFF)
# warning options
option(SPDLOG_ENABLE_WARNINGS "Enable compiler warnings" ON)
# install options # install options
option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PROJECT}) option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PROJECT})
option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)

22
cmake/utils.cmake
View File

@ -28,17 +28,19 @@ endfunction()
# Turn on warnings on the given target # Turn on warnings on the given target
function(spdlog_enable_warnings target_name) function(spdlog_enable_warnings target_name)
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if(SPDLOG_ENABLE_WARNINGS)
list(APPEND MSVC_OPTIONS "/W3") if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(MSVC_VERSION GREATER 1900) #Allow non fatal security wanrnings for msvc 2015 list(APPEND MSVC_OPTIONS "/W3")
list(APPEND MSVC_OPTIONS "/WX") if(MSVC_VERSION GREATER 1900) #Allow non fatal security wanrnings for msvc 2015
endif() list(APPEND MSVC_OPTIONS "/WX")
endif() endif()
endif()
target_compile_options(${target_name} PRIVATE target_compile_options(${target_name} PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>: $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-Wall -Wextra -Wconversion -pedantic -Wfatal-errors> -Wall -Wextra -Wconversion -pedantic -Wfatal-errors>
$<$<CXX_COMPILER_ID:MSVC>:${MSVC_OPTIONS}>) $<$<CXX_COMPILER_ID:MSVC>:${MSVC_OPTIONS}>)
endif()
endfunction() endfunction()