Fix test build

ARM-software · Jan 16, 2025 · 8d4f001 · 8d4f001
1 parent 421dac4
commit 8d4f001
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -105,10 +105,17 @@ if(${ASTCENC_UNITTEST})
     set(CMAKE_OSX_ARCHITECTURES x86_64;arm64)
     add_subdirectory(GoogleTest)
 
-    # Workaround Google Test issue
+    # Workaround GoogleTest CRT selection issue issue
     # See https://github.com/google/googletest/issues/4067
-    set_property(TARGET gtest PROPERTY MSVC_RUNTIME_LIBRARY "-MT")
-    set_property(TARGET gtest_main PROPERTY MSVC_RUNTIME_LIBRARY "-MT")
+    set_property(
+        TARGET gtest
+            PROPERTY
+                MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+    set_property(
+        TARGET gtest_main
+            PROPERTY
+                MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
     enable_testing()
     add_subdirectory(UnitTest)

diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // ----------------------------------------------------------------------------
-// Copyright 2011-2024 Arm Limited
+// Copyright 2011-2025 Arm Limited
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy
@@ -257,6 +257,7 @@ static inline unsigned int get_quant_level(quant_method method)
 	case QUANT_160: return 160;
 	case QUANT_192: return 192;
 	case QUANT_256: return 256;
+	default:        break;
 	}
 
 	// Unreachable - the enum is fully described