Skip to content

Commit 7c3ae4c

Browse files
committed
update build system to cover msdf target's changes
1 parent a07c1a3 commit 7c3ae4c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

3rdparty/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,19 @@ add_subdirectory(freetype2 freetype2 EXCLUDE_FROM_ALL)
2929
add_library(Freetype::Freetype ALIAS freetype) # alias target for MSDFGEN not trying to find freetype system-wide but rather to use the logical target available in our build tree
3030

3131
# msdfgen
32+
set(MSDFGEN_USE_VCPKG OFF)
3233
set(MSDFGEN_CORE_ONLY OFF) # if turned on then MSDFGEN will be built without dependencies like freetype or skia
3334
set(MSDFGEN_INSTALL OFF)
3435
set(MSDFGEN_BUILD_STANDALONE OFF)
3536
set(MSDFGEN_USE_CPP11 ON)
37+
set(MSDFGEN_DISABLE_SVG ON)
38+
set(MSDFGEN_DISABLE_PNG ON)
3639
add_subdirectory(msdfgen msdfgen EXCLUDE_FROM_ALL)
3740

3841
if(MSDFGEN_CORE_ONLY)
39-
set(NBL_MSDFGEN_TARGETS msdfgen-core)
42+
message(FATAL_ERROR "Internal error, MSDF must be used with extension target as well!")
4043
else()
41-
set(NBL_MSDFGEN_TARGETS msdfgen-ext)
44+
set(NBL_MSDFGEN_TARGETS msdfgen-ext msdfgen-core)
4245
endif()
4346

4447
set_property(TARGET simdjson PROPERTY CXX_STANDARD 17)
@@ -378,7 +381,6 @@ set(NBL_3RDPARTY_TARGETS
378381
jpeg-static
379382
bzip2
380383
simdjson
381-
msdfgen-core
382384
nlohmann_json
383385
glslang
384386
OGLCompiler

0 commit comments

Comments
 (0)