Skip to content

Commit

Permalink
Change handling of samples that require Freetype
Browse files Browse the repository at this point in the history
  • Loading branch information
hobyst committed Dec 2, 2023
1 parent 8e037f4 commit 4f25480
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
18 changes: 11 additions & 7 deletions Samples/basic/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Add CMake subdirectories of basic samples
add_subdirectory("benchmark")
add_subdirectory("demo")
add_subdirectory("bitmapfont")

# Negotiate inclusion of Lottie sample
if(RMLUI_LOTTIE_PLUGIN)
add_subdirectory("lottie")
else()
message(NOTICE "Lottie sample disabled due to RMLUI_LOTTIE_PLUGIN=OFF")
# If a font interface has been selected, add CMake subdirectories of samples that require it
if(NOT (RMLUI_FONT_INTERFACE STREQUAL "none"))
add_subdirectory("benchmark")
add_subdirectory("demo")

# Negotiate inclusion of Lottie sample
if(RMLUI_LOTTIE_PLUGIN)
add_subdirectory("lottie")
else()
message(NOTICE "Lottie sample disabled due to RMLUI_LOTTIE_PLUGIN=OFF")
endif()
endif()
14 changes: 6 additions & 8 deletions Samples/basic/benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
if(NOT (RMLUI_FONT_INTERFACE STREQUAL "none"))
# Declare executable
add_executable(rmlui_sample_benchmark WIN32
src/main.cpp
)
# Declare executable
add_executable(rmlui_sample_benchmark WIN32
src/main.cpp
)

# Link shell library
target_link_libraries(rmlui_sample_benchmark PRIVATE rmlui_sample_shell)
endif()
# Link shell library
target_link_libraries(rmlui_sample_benchmark PRIVATE rmlui_sample_shell)
14 changes: 6 additions & 8 deletions Samples/basic/demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
if(NOT (RMLUI_FONT_INTERFACE STREQUAL "none"))
# Declare executable
add_executable(rmlui_sample_demo WIN32
src/main.cpp
)
# Declare executable
add_executable(rmlui_sample_demo WIN32
src/main.cpp
)

# Link shell library
target_link_libraries(rmlui_sample_demo PRIVATE rmlui_sample_shell)
endif()
# Link shell library
target_link_libraries(rmlui_sample_demo PRIVATE rmlui_sample_shell)

0 comments on commit 4f25480

Please sign in to comment.