Skip to content

fix cmake problems: #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariuszmaximus wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix cmake problems: #287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
890c584
fix cmake problems:
mariuszmaximus Feb 8, 2025
9cd114c
fix cmake "circular dependency"
mariuszmaximus Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions demos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,14 @@ target_include_directories(demo-utils
)

add_custom_command(
DEPENDS
makefont
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
COMMAND
../$<$<BOOL:MSVC>:$(Configuration)/>makefont
ARGS
--font fonts/Vera.ttf
--header ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
--size 16
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
COMMAND
${CMAKE_BINARY_DIR}/makefont
ARGS
--font fonts/Vera.ttf
--header ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
--size 16
--variable font
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
Expand Down Expand Up @@ -95,7 +94,7 @@ create_demo(distance-field-3 distance-field-3.c)
if(FONTCONFIG_FOUND)
include_directories(${FONTCONFIG_INCLUDE_DIR})
create_demo(markup markup.c)
target_link_libraries(markup ${Fontconfig_LIBRARY})
target_link_libraries(markup ${FONTCONFIG_LIBRARY})
endif()

if(ANT_TWEAK_BAR_FOUND)
Expand Down