File tree 2 files changed +12
-4
lines changed
2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -105,10 +105,17 @@ if(${ASTCENC_UNITTEST})
105
105
set (CMAKE_OSX_ARCHITECTURES x86_64;arm64)
106
106
add_subdirectory (GoogleTest)
107
107
108
- # Workaround Google Test issue
108
+ # Workaround GoogleTest CRT selection issue issue
109
109
# 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>" )
112
119
113
120
enable_testing ()
114
121
add_subdirectory (UnitTest)
Original file line number Diff line number Diff line change 1
1
// SPDX-License-Identifier: Apache-2.0
2
2
// ----------------------------------------------------------------------------
3
- // Copyright 2011-2024 Arm Limited
3
+ // Copyright 2011-2025 Arm Limited
4
4
//
5
5
// Licensed under the Apache License, Version 2.0 (the "License"); you may not
6
6
// 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)
257
257
case QUANT_160: return 160 ;
258
258
case QUANT_192: return 192 ;
259
259
case QUANT_256: return 256 ;
260
+ default : break ;
260
261
}
261
262
262
263
// Unreachable - the enum is fully described
You can’t perform that action at this time.
0 commit comments