From 24b3d73ac2794bbf8ee9df9c6dfdbdb3180d18f4 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 4 Jan 2008 10:16:21 +0000 Subject: my first KDE 4.1 commit ;-) -add FREETYPE_INCLUDE_DIRS to make it compatible with the version in cmake cvs -everything lower case -FREETYPE_LIBRARIES doesn't need to be INTERNAL, STRING is better Alex svn path=/trunk/KDE/kdelibs/; revision=757150 --- modules/FindFreetype.cmake | 47 ++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index d2821931..6fd1bb13 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -2,9 +2,10 @@ # Once done this will define # # FREETYPE_FOUND - system has Freetype -# FREETYPE_INCLUDE_DIR - the FREETYPE include directory +# FREETYPE_INCLUDE_DIRS - the FREETYPE include directories # FREETYPE_LIBRARIES - Link these to use FREETYPE -# +# FREETYPE_INCLUDE_DIR - internal + # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. @@ -18,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 ) @@ -29,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) - MARK_AS_ADVANCED(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) + set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE STRING "The libraries for freetype" ) - set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" ) + mark_as_advanced(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) 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) @@ -58,14 +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}") -- cgit v1.2.1 From 643c9bd104e8630b75352293c482c68803700ae7 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 4 Jan 2008 16:54:52 +0000 Subject: this one is already marked as ADVANCED above Alex svn path=/trunk/KDE/kdelibs/; revision=757290 --- modules/FindX11.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 5fdbe82f..193723bc 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -415,7 +415,6 @@ 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 -- cgit v1.2.1 From 8c493682049ec873d71ad5ccece8279a6c774af7 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 5 Jan 2008 19:32:52 +0000 Subject: SVN_SILENT: KDE4_ADD_WIN32_APP_ICON was renamed to KDE4_ADD_APP_ICON svn path=/trunk/KDE/kdelibs/; revision=757741 --- modules/KDE4Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 4f4e0a9f..d864ecea 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_WIN32_APP_ICON (Use on Win32) +# KDE4_ADD_APP_ICON # KDE4_CREATE_MANPAGE # Copyright (c) 2006, 2007, Alexander Neundorf, -- cgit v1.2.1 From e6b4768379c76438f6d2d1fe3071ff60a7846cbf Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 9 Jan 2008 17:09:40 +0000 Subject: fix installation of handbooks when DESTDIR installation is used svn path=/trunk/KDE/kdelibs/; revision=758943 --- modules/KDE4Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index d864ecea..2ffed912 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -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\" \"${_installDest}/${dirname}/common\" )" ) + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"\$ENV{DESTDIR}${_installDest}/common\" \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" ) endif (UNIX) endif(_installDest) -- cgit v1.2.1 From a8a2bb7dc6d1872538ec781a837bbe6495992585 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 9 Jan 2008 22:21:06 +0000 Subject: of course I notice the bug just after I committed it ;( svn path=/trunk/KDE/kdelibs/; revision=759070 --- modules/KDE4Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 2ffed912..cbb7def8 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -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 \"\$ENV{DESTDIR}${_installDest}/common\" \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" ) + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" ) endif (UNIX) endif(_installDest) -- cgit v1.2.1