Skip to content

Commit 8d4f001

Browse files
committed
Fix test build
1 parent 421dac4 commit 8d4f001

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Source/CMakeLists.txt

+10-3
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,17 @@ if(${ASTCENC_UNITTEST})
105105
set(CMAKE_OSX_ARCHITECTURES x86_64;arm64)
106106
add_subdirectory(GoogleTest)
107107

108-
# Workaround Google Test issue
108+
# Workaround GoogleTest CRT selection issue issue
109109
# See https://github.com/google/googletest/issues/4067
110-
set_property(TARGET gtest PROPERTY MSVC_RUNTIME_LIBRARY "-MT")
111-
set_property(TARGET gtest_main PROPERTY MSVC_RUNTIME_LIBRARY "-MT")
110+
set_property(
111+
TARGET gtest
112+
PROPERTY
113+
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
114+
115+
set_property(
116+
TARGET gtest_main
117+
PROPERTY
118+
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
112119

113120
enable_testing()
114121
add_subdirectory(UnitTest)

Source/astcenc_internal.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// ----------------------------------------------------------------------------
3-
// Copyright 2011-2024 Arm Limited
3+
// Copyright 2011-2025 Arm Limited
44
//
55
// Licensed under the Apache License, Version 2.0 (the "License"); you may not
66
// 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)
257257
case QUANT_160: return 160;
258258
case QUANT_192: return 192;
259259
case QUANT_256: return 256;
260+
default: break;
260261
}
261262

262263
// Unreachable - the enum is fully described

0 commit comments

Comments
 (0)