diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindFreetype.cmake | 44 | ||||
| -rw-r--r-- | modules/FindX11.cmake | 1 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 4 |
3 files changed, 25 insertions, 24 deletions
diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 6fd1bb13..66198b9e 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -4,7 +4,7 @@ # FREETYPE_FOUND - system has Freetype # FREETYPE_INCLUDE_DIRS - the FREETYPE include directories # FREETYPE_LIBRARIES - Link these to use FREETYPE -# FREETYPE_INCLUDE_DIR - internal +# FREETYPE_INCLUDE_DIR is internal and deprecated for use # Copyright (c) 2006, Laurent Montel, <montel@kde.org> # @@ -19,7 +19,7 @@ if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) - find_program(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS + FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS /opt/local/bin ) @@ -30,28 +30,28 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) # if freetype-config has been found if(FREETYPECONFIG_EXECUTABLE) - exec_program(${FREETYPECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_LIBRARIES) + EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_LIBRARIES) - exec_program(${FREETYPECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _freetype_pkgconfig_output) + EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _freetype_pkgconfig_output) if(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output) set(FREETYPE_FOUND TRUE) # freetype-config can print out more than one -I, so we need to chop it up # into a list and process each entry separately - separate_arguments(_freetype_pkgconfig_output) - foreach(value ${_freetype_pkgconfig_output}) - string(REGEX REPLACE "-I(.+)" "\\1" value "${value}") + SEPARATE_ARGUMENTS(_freetype_pkgconfig_output) + FOREACH(value ${_freetype_pkgconfig_output}) + STRING(REGEX REPLACE "-I(.+)" "\\1" value "${value}") set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR} ${value}) - endforeach(value) + ENDFOREACH(value) endif(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output) - set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE STRING "The libraries for freetype" ) + MARK_AS_ADVANCED(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) - mark_as_advanced(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) + set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" ) else(FREETYPECONFIG_EXECUTABLE) - find_path (FREETYPE_INCLUDE_DIR freetype2/freetype/freetype.h) - set (FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR}/freetype2) + find_path (FREETYPE_INCLUDE_DIR freetype2/freetype/freetype.h) + set (FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR}/freetype2) find_library(FREETYPE_LIBRARIES freetype) if(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES) set(FREETYPE_FOUND TRUE) @@ -59,16 +59,16 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) endif(FREETYPECONFIG_EXECUTABLE) - if (FREETYPE_FOUND) - if (NOT Freetype_FIND_QUIETLY) - message(STATUS "Found Freetype: ${FREETYPE_LIBRARIES}") - endif (NOT Freetype_FIND_QUIETLY) - else (FREETYPE_FOUND) - if (Freetype_FIND_REQUIRED) - message(FATAL_ERROR "Could not find FreeType library") - endif (Freetype_FIND_REQUIRED) - endif (FREETYPE_FOUND) + IF (FREETYPE_FOUND) + IF (NOT Freetype_FIND_QUIETLY) + MESSAGE(STATUS "Found Freetype: ${FREETYPE_LIBRARIES}") + ENDIF (NOT Freetype_FIND_QUIETLY) + ELSE (FREETYPE_FOUND) + IF (Freetype_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find FreeType library") + ENDIF (Freetype_FIND_REQUIRED) + ENDIF (FREETYPE_FOUND) endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) -set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}") +set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR}) diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 193723bc..5fdbe82f 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -415,6 +415,7 @@ IF (UNIX) X11_Xaccessrules_INCLUDE_PATH X11_Xaccessstr_INCLUDE_PATH X11_Xdmcp_INCLUDE_PATH + X11_xf86misc_INCLUDE_PATH X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xkbfile_INCLUDE_PATH diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index cbb7def8..4f4e0a9f 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -19,7 +19,7 @@ # KDE4_REMOVE_OBSOLETE_CMAKE_FILES # KDE4_NO_ENABLE_FINAL # KDE4_CREATE_HANDBOOK -# KDE4_ADD_APP_ICON +# KDE4_ADD_WIN32_APP_ICON (Use on Win32) # KDE4_CREATE_MANPAGE # Copyright (c) 2006, 2007, Alexander Neundorf, <neundorf@kde.org> @@ -308,7 +308,7 @@ macro (KDE4_CREATE_HANDBOOK _docbook) # TODO symlinks on non-unix platforms if (UNIX) # execute some cmake code on make install which creates the symlink - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" ) + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"${_installDest}/${dirname}/common\" )" ) endif (UNIX) endif(_installDest) |