Skip to content
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

Jump to bottom

CMakeLists improvements #162

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

CMakeLists improvements #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
357e211
Added CMake error when ImageMagick is not found and tests are to be b…
wmamrak Apr 18, 2017
600a6b6
Don't add generate-embedded-font and embedded-font targets when freet…
wmamrak Apr 18, 2017
049c38e
Fixed missing _USE_MATH_DEFINES preprocessor definition
wmamrak Apr 18, 2017
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
12 changes: 9 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ option(freetype-gl_BUILD_HARFBUZZ "Build the freetype-gl harfbuzz support (exper
option(freetype-gl_BUILD_MAKEFONT "Build the makefont tool" ON)
option(freetype-gl_BUILD_TESTS "Build the tests" ON)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this should be OFF by default

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it could be. And installing ImageMagick should satisfy Jarvis.


if(${freetype-gl_BUILD_TESTS})
find_package(ImageMagick QUIET COMPONENTS compare)
if(NOT ${ImageMagick_EXECUTABLE_DIR})
message(FATAL_ERROR "ImageMagick was not found. Either provide path to ImageMagick, or disable freetype-gl_BUILD_TESTS option.")
endif()
endif()

include(RequireIncludeFile)
include(RequireFunctionExists)
include(CheckLibraryExists)
Expand Down Expand Up @@ -63,11 +70,10 @@ check_symbol_exists(M_PI math.h HAVE_M_PI)

if(NOT HAVE_M_PI)
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_USE_MATH_DEFINES)
unset(HAVE_M_PI CACHE)

check_symbol_exists(M_PI math.h HAVE_M_PI)
check_symbol_exists(M_PI math.h HAVE_M_PI2)

if(NOT HAVE_M_PI)
if(NOT HAVE_M_PI2)
message(FATAL_ERROR "`M_PI` not defined in `math.h`.")
else()
add_definitions(-D_USE_MATH_DEFINES)
Expand Down
40 changes: 21 additions & 19 deletions demos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,29 @@ target_include_directories(demo-utils
PUBLIC $<TARGET_PROPERTY:glfw,INTERFACE_INCLUDE_DIRECTORIES>
)

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
--variable font
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
)
if(freetype-gl_BUILD_MAKEFONT)
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
--variable font
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
)

add_custom_target(generate-embedded-font
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
)
add_custom_target(generate-embedded-font
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vera-16.h
)

create_demo(embedded-font embedded-font.c)
add_dependencies(embedded-font generate-embedded-font)
create_demo(embedded-font embedded-font.c)
add_dependencies(embedded-font generate-embedded-font)
endif()

create_demo(texture texture.c)
create_demo(font font.c)
Expand Down