Merge remote-tracking branch 'upstream/master'

cmake/CompileFlags.cmake

@@ -4,24 +4,7 @@
 #
 macro(compile_flags)
     if(MSVC)
-        add_compile_options(/bigobj)
-        if(VCPKG_TARGET_TRIPLET MATCHES "-static" AND NOT VCPKG_TARGET_TRIPLET MATCHES "-md")
-            # Switch to MT (static) instead of MD (dynamic) binary
-
-            # For MSVC two generators are available
-            # - a command line generator (Ninja) using CMAKE_BUILD_TYPE to specify the
-            #   configuration of the build tree
-            # - an IDE generator (Visual Studio) using CMAKE_CONFIGURATION_TYPES to
-            #   specify all configurations that will be available in the generated solution
-            list(APPEND MSVC_CONFIGS "${CMAKE_BUILD_TYPE}" "${CMAKE_CONFIGURATION_TYPES}")
-
-            # Set usage of static runtime for all configurations
-            foreach(MSVC_CONFIG ${MSVC_CONFIGS})
-                string(TOUPPER "CMAKE_CXX_FLAGS_${MSVC_CONFIG}" MSVC_FLAGS)
-                string(REPLACE "/MD" "/MT" ${MSVC_FLAGS} "${${MSVC_FLAGS}}")
-            endforeach()
-        endif()
-
+        add_compile_options(/bigobj)  # CM
         # "If /Zc:rvalueCast is specified, the compiler follows section 5.4 of the
         # C++11 standard". We need C++11 for the way we use threads.
         add_compile_options(/Zc:rvalueCast)
@@ -34,6 +17,13 @@ macro(compile_flags)
         endif()
     endif()
 
+    # Our strings are UTF-8.
+    if(MSVC)
+        add_compile_options(/utf-8)
+    else()
+        add_compile_options(-finput-charset=utf-8)
+    endif()
+
     # Add some -D flags for Debug builds. We cannot use add_definitions(), because
     # it does not appear to support the $<> tags.
     add_compile_options(
@@ -56,9 +46,13 @@ macro(compile_flags)
     set(IS_STABLE_RELEASE "$<AND:$<NOT:$<CONFIG:Debug>>,$<NOT:$<BOOL:${OPTION_USE_ASSERTS}>>>")
 
     if(MSVC)
-        add_compile_options(/W3)
-        if(MSVC_VERSION GREATER 1929 AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            # Starting with version 19.30, there is an optimisation bug, see #9966 for details
+        add_compile_options(
+            /W3
+            /w34100 # 'identifier' : unreferenced formal parameter
+            /w34189 # 'identifier' : local variable is initialized but not referenced
+        )
+        if(MSVC_VERSION GREATER 1929 AND MSVC_VERSION LESS 1937 AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            # Starting with version 19.30 (fixed in version 19.37), there is an optimisation bug, see #9966 for details
             # This flag disables the broken optimisation to work around the bug
             add_compile_options(/d2ssa-rse-)
         endif()
@@ -77,9 +71,8 @@ macro(compile_flags)
             -Wformat=2
             -Winit-self
             -Wnon-virtual-dtor
+            -Wsuggest-override
 
-            # Often parameters are unused, which is fine.
-            -Wno-unused-parameter
             # We use 'ABCD' multichar for SaveLoad chunks identifiers
             -Wno-multichar
 
@@ -90,22 +83,6 @@ macro(compile_flags)
             -fno-strict-aliasing
         )
 
-        # When we are a stable release (Release build + USE_ASSERTS not set),
-        # assertations are off, which trigger a lot of warnings. We disable
-        # these warnings for these releases.
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            add_compile_options(
-                "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
-                "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-parameter>"
-                "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-variable>"
-            )
-        else()
-            add_compile_options(
-                "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
-                "$<${IS_STABLE_RELEASE}:-Wno-unused-parameter>"
-            )
-        endif()
-
         # Ninja processes the output so the output from the compiler
         # isn't directly to a terminal; hence, the default is
         # non-coloured output. We can override this to get nicely