cmake: Make Freetype mandatory for non-headless builds

OpenClonk fails to start without Freetype support, because it cannot
load required fonts.
stable-5.4
Nicolas Hake 2013-10-18 18:43:28 +02:00
parent 9e18ca3c9f
commit 759cf73704
4 changed files with 1 additions and 9 deletions

View File

@ -856,9 +856,8 @@ if(NOT WIN32)
endif()
if(NOT USE_CONSOLE)
find_package(Freetype)
find_package(Freetype REQUIRED)
include_directories(${FREETYPE_INCLUDE_DIRS})
SET(HAVE_FREETYPE ${FREETYPE_FOUND} CACHE INTERNAL "Rename of FREETYPE_FOUND for config.h")
endif()
# FINDLIB works the same as find_library, but also marks the resulting var as

View File

@ -13,9 +13,6 @@
/* Whether FMOD shall be used */
#cmakedefine HAVE_FMOD 1
/* Define to 1 if you have FreeType2. */
#cmakedefine HAVE_FREETYPE 1
/* Define to 1 if you have the <history.h> header file. */
#cmakedefine HAVE_HISTORY_H 1

View File

@ -18,9 +18,6 @@
/* The backtrace function is declared in execinfo.h and works */
#undef HAVE_EXECINFO_H
/* Define to 1 if you have FreeType2. */
#undef HAVE_FREETYPE
/* Define to 1 if you have the <history.h> header file. */
#undef HAVE_HISTORY_H

View File

@ -281,7 +281,6 @@ if test $enable_console = no; then
AC_MSG_ERROR([Freetype not found.])
fi
])
AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have FreeType2.])
fi
# X11, Xrandr