MSVC: compile test suite with /W4

timsort · Jan 27, 2024 · 25443c7 · 25443c7
1 parent 6b9ff4d
commit 25443c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -42,16 +42,18 @@ macro(configure_tests target)
     )
 
     # Add warnings
-    if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "GNU")
+    if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
         target_compile_options(${target} PRIVATE
             -Wall -Wextra -Wcast-align -Wmissing-declarations -Wmissing-include-dirs
             -Wnon-virtual-dtor -Wodr -Wpedantic -Wredundant-decls -Wundef -Wunreachable-code
             $<$<CXX_COMPILER_ID:GNU>:-Wlogical-op -Wuseless-cast>
         )
+    elseif (MSVC)
+        target_compile_options(${target} PRIVATE /W4)
     endif()
 
     # Configure optimization options
-    if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "GNU")
+    if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
         target_compile_options(${target} PRIVATE
             $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:Clang>>:-O0>
             $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:GNU>>:-Og>

diff --git a/tests/cxx_17_tests.cpp b/tests/cxx_17_tests.cpp
@@ -60,7 +60,7 @@ TEST_CASE( "generalized callables" ) {
         CHECK(is_vec_sorted());
     }
 
-    std::uniform_int_distribution<int> random_middle(0, vec.size());
+    std::uniform_int_distribution<int> random_middle(0, static_cast<int>(vec.size()));
 
     SECTION( "timmerge for comparisons" ) {
         const auto middle = vec.begin() + random_middle(gen);