Skip to content

Commit f9e1ede

Browse files
committed
fix: set CMP0091 default for FreeType/HarfBuzz FetchContent to fix CRT mismatch on MSVC
1 parent 146abd3 commit f9e1ede

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ set(VRHI_VERSION "v0.1.4" CACHE STRING "VRHI release version to fetch")
2626
include(FetchContent)
2727

2828
if(VEFC_ENABLE_FREETYPE)
29+
set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
2930
FetchContent_Declare(
3031
freetype
3132
GIT_REPOSITORY https://github.com/freetype/freetype.git
@@ -38,6 +39,7 @@ if(VEFC_ENABLE_FREETYPE)
3839
endif()
3940

4041
if(VEFC_ENABLE_HARFBUZZ)
42+
set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
4143
FetchContent_Declare(
4244
harfbuzz
4345
GIT_REPOSITORY https://github.com/harfbuzz/harfbuzz.git

tests/test_main.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,4 @@
4646
#include "test_lifecycle.cpp"
4747
#include "test_atlas.cpp"
4848

49-
UTEST_STATE();
50-
int main(int argc, const char *const argv[])
51-
{
52-
printf("TEST_MAIN_STARTED\n");
53-
fflush(stdout);
54-
return utest_main(argc, argv);
55-
}
49+
UTEST_MAIN();

0 commit comments

Comments
 (0)