diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | cmake/FindFontconfig.cmake | 50 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
3 files changed, 54 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c824dd2..6efdc84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,18 +140,17 @@ ENDIF ( Apple ) # LIBS SEARCH ############################################################################### MESSAGE ( STATUS "<Locating ZIP library>" ) -MESSAGE ( STATUS "<******************************>" ) FIND_PACKAGE ( ZIP REQUIRED ) IF ( NOT WITH_SERVER ) + MESSAGE ( STATUS "<Locating Fontconfig" ) + FIND_PACKAGE ( Fontconfig REQUIRED ) IF ( WITH_OPENGL ) MESSAGE ( STATUS "<Locating OpenGL>" ) - MESSAGE ( STATUS "<******************************>" ) FIND_PACKAGE ( OpenGL REQUIRED ) INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIR} ) ENDIF ( WITH_OPENGL ) MESSAGE ( STATUS "<Locating SDL>" ) - MESSAGE ( STATUS "<******************************>" ) FIND_PACKAGE ( SDL REQUIRED ) FIND_PACKAGE ( SDL_image REQUIRED ) FIND_PACKAGE ( SDL_ttf REQUIRED ) @@ -160,6 +159,7 @@ IF ( NOT WITH_SERVER ) INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} ) ENDIF ( WITH_AUDIO ) INCLUDE_DIRECTORIES ( + ${FONTCONFIG_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} @@ -170,15 +170,12 @@ ENDIF ( NOT WITH_SERVER ) ############################################################################### IF ( WITH_NLS ) MESSAGE ( STATUS "<Building with NLS as requested>" ) - MESSAGE ( STATUS "<******************************>" ) ADD_DEFINITIONS ( -DNLS ) ADD_SUBDIRECTORY ( po ) ENDIF ( WITH_NLS ) ############################################################################### # COMPILATION ITSELF ############################################################################### -MESSAGE ( STATUS "<Compiling SRC>" ) -MESSAGE ( STATUS "<******************************>" ) CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${CMAKE_BINARY_DIR}/src/base/path.h ) ADD_SUBDIRECTORY ( src ) ############################################################################### diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake new file mode 100644 index 0000000..268a61a --- /dev/null +++ b/cmake/FindFontconfig.cmake @@ -0,0 +1,50 @@ +# - Try to find the Fontconfig +# Once done this will define +# +# FONTCONFIG_FOUND - system has Fontconfig +# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers +# FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG +# FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG + +# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) + + # in cache already + set(FONTCONFIG_FOUND TRUE) + +else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) + + if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig) + pkg_check_modules(PC_FONTCONFIG fontconfig) + + set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) + endif (NOT WIN32) + + find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h + PATHS + ${PC_FONTCONFIG_INCLUDEDIR} + ${PC_FONTCONFIG_INCLUDE_DIRS} + /usr/X11/include + ) + + find_library(FONTCONFIG_LIBRARIES NAMES fontconfig + PATHS + ${PC_FONTCONFIG_LIBDIR} + ${PC_FONTCONFIG_LIBRARY_DIRS} + ) + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR ) + + mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR) + +endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3e9bf09..5a640c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ ELSE ( WITH_SERVER ) LINK_LIBRARIES ( ${ZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ) ENDIF ( WITH_AUDIO ) - LINK_LIBRARIES ( SDLmain ) + LINK_LIBRARIES ( ${FONTCONFIG_LIBRARIES} SDLmain ) ENDIF ( WITH_SERVER ) ############################################################################### @@ -95,7 +95,6 @@ ENDIF ( ENABLE_IPV6 ) IF ( NOT WITH_SERVER ) IF ( WITH_AUDIO ) MESSAGE ( STATUS "<Building with audio as requested>" ) - MESSAGE ( STATUS "<******************************>" ) SET ( SRC_compile ${SRC_base} ${SRC_client} ${SRC_audio} ) INCLUDE_DIRECTORIES ( ${WORKDIR}/audio ) ELSE ( WITH_AUDIO ) @@ -106,8 +105,6 @@ ENDIF ( NOT WITH_SERVER ) # OPENGL CHECK ############################################################################### IF ( WITH_OPENGL ) - MESSAGE ( STATUS "<Building with OPENGL as requested>" ) - MESSAGE ( STATUS "<******************************>" ) ADD_DEFINITIONS ( -DSUPPORT_OPENGL ) ENDIF ( WITH_OPENGL ) ############################################################################### @@ -119,7 +116,6 @@ ADD_SUBDIRECTORY ( modules ) ############################################################################### IF ( WITH_SERVER ) MESSAGE ( STATUS "<Building server as requested>" ) - MESSAGE ( STATUS "<******************************>" ) SET ( SRC_compile ${SRC_base} ${SRC_server} ) ADD_EXECUTABLE ( ${APPNAME} ${SRC_compile} ) ELSE ( WITH_SERVER ) @@ -127,7 +123,6 @@ ELSE ( WITH_SERVER ) # CLIENT COMPILATION ############################################################################### MESSAGE ( STATUS "<Building client as requested>" ) - MESSAGE ( STATUS "<******************************>" ) ADD_EXECUTABLE ( ${APPNAME} ${SRC_compile} ) ENDIF ( WITH_SERVER ) ################################################################################ |