From 132d93f0d7376e149876bcfa189c5635f5360ae4 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 20 Jul 2006 13:37:07 +0000 Subject: Now into kdelibs as kdebase and koffice use them svn path=/trunk/KDE/kdelibs/; revision=564569 --- modules/FindFreetype.cmake | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/FindFreetype.cmake (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake new file mode 100644 index 00000000..8a11dc40 --- /dev/null +++ b/modules/FindFreetype.cmake @@ -0,0 +1,43 @@ +# - Try to find the freetype library +# Once done this will define +# +# FREETYPE_FOUND - system has Fontconfig +# FREETYPE_INCLUDE_DIR - the FONTCONFIG include directory +# FREETYPE_LIBRARIES - Link these to use FREETYPE +# + +if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + + # in cache already + set(FREETYPE_FOUND TRUE) + +else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + + FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS + /usr/bin + /usr/local/bin + /opt/local/bin + ) + + #reset vars + set(FREETYPE_LIBRARIES) + set(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 --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_INCLUDE_DIR) + if(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + set(FREETYPE_FOUND TRUE) + #message(STATUS "Found freetype: ${FREETYPE_LIBRARIES}") + endif(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + + MARK_AS_ADVANCED(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) + + set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" ) + + endif(FREETYPECONFIG_EXECUTABLE) + +endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindFreetype.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 8a11dc40..8fdb1692 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -5,6 +5,11 @@ # FREETYPE_INCLUDE_DIR - the FONTCONFIG include directory # FREETYPE_LIBRARIES - Link these to use FREETYPE # +# Copyright (c) 2006, Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From 1268579a93f7d2915c547c923048c30dd0899f05 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 9 Nov 2006 14:05:02 +0000 Subject: Fatal error when we didn't find it and it's requires (found when I try to port compile under MacOsX) svn path=/trunk/KDE/kdelibs/; revision=603631 --- modules/FindFreetype.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 8fdb1692..571021a0 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -45,4 +45,15 @@ 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) + endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From 363b00645449dfa42b9a1b7a2a68029150123948 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 14 Mar 2007 17:06:43 +0000 Subject: Fix display message svn path=/trunk/KDE/kdelibs/; revision=642545 --- modules/FindFreetype.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 571021a0..0aee8be1 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -47,13 +47,13 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) IF (FREETYPE_FOUND) - IF (NOT FREETYPE_FIND_QUIETLY) + IF (NOT Freetype_FIND_QUIETLY) MESSAGE(STATUS "Found Freetype: ${FREETYPE_LIBRARIES}") - ENDIF (NOT FREETYPE_FIND_QUIETLY) + ENDIF (NOT Freetype_FIND_QUIETLY) ELSE (FREETYPE_FOUND) - IF (FREETYPE_FIND_REQUIRED) + IF (Freetype_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find FreeType library") - ENDIF (FREETYPE_FIND_REQUIRED) + ENDIF (Freetype_FIND_REQUIRED) ENDIF (FREETYPE_FOUND) endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From bce49ea80b0598bf3005cf633bac9cf1524d8735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 4 Apr 2007 10:29:55 +0000 Subject: Freetype, not fontconfig. svn path=/trunk/KDE/kdelibs/; revision=650344 --- modules/FindFreetype.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 0aee8be1..426b5e39 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -1,8 +1,8 @@ # - Try to find the freetype library # Once done this will define # -# FREETYPE_FOUND - system has Fontconfig -# FREETYPE_INCLUDE_DIR - the FONTCONFIG include directory +# FREETYPE_FOUND - system has Freetype +# FREETYPE_INCLUDE_DIR - the FREETYPE include directory # FREETYPE_LIBRARIES - Link these to use FREETYPE # # Copyright (c) 2006, Laurent Montel, -- cgit v1.2.1 From e6ab0424543faeee62b4a5cf98b2c0270391dc59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 4 Apr 2007 12:31:44 +0000 Subject: INCLUDE_DIR should not include -I svn path=/trunk/KDE/kdelibs/; revision=650381 --- modules/FindFreetype.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 426b5e39..f56ad2ad 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -37,6 +37,7 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) if(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) set(FREETYPE_FOUND TRUE) #message(STATUS "Found freetype: ${FREETYPE_LIBRARIES}") + STRING(REGEX REPLACE "-I(.+)" "\\1" FREETYPE_INCLUDE_DIR "${FREETYPE_INCLUDE_DIR}") endif(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) MARK_AS_ADVANCED(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From 8db515aefb36667de829838150de61bded53cc1e Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 9 Apr 2007 01:36:46 +0000 Subject: fix freetype building when freetype-config prints out more than one -I svn path=/trunk/KDE/kdelibs/; revision=651730 --- modules/FindFreetype.cmake | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index f56ad2ad..2ce6eab3 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -33,12 +33,18 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) 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_INCLUDE_DIR) - if(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + 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) - #message(STATUS "Found freetype: ${FREETYPE_LIBRARIES}") - STRING(REGEX REPLACE "-I(.+)" "\\1" FREETYPE_INCLUDE_DIR "${FREETYPE_INCLUDE_DIR}") - endif(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) + + # 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}") + set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR} ${value}) + ENDFOREACH(value) + endif(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output) MARK_AS_ADVANCED(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From b934aae5f61f38183cd62a459c61b2625e71b52c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 3 Aug 2007 01:13:21 +0000 Subject: remove unnecessary default search paths Alex svn path=/trunk/KDE/kdelibs/; revision=695813 --- modules/FindFreetype.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 2ce6eab3..f061e71a 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -19,8 +19,6 @@ if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS - /usr/bin - /usr/local/bin /opt/local/bin ) -- cgit v1.2.1 From fcb850840ed38333a3b1ae4b79c676686e443dd9 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Sun, 11 Nov 2007 15:23:46 +0000 Subject: make freetype findable under windows svn path=/trunk/KDE/kdelibs/; revision=735384 --- modules/FindFreetype.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index f061e71a..89b70a61 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -48,6 +48,14 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" ) + else(FREETYPECONFIG_EXECUTABLE) + find_path (FREETYPE_INCLUDE_DIR freetype/freetype.h + ${CMAKE_INCLUDE_PATH}/freetype2 + ) + find_library(FREETYPE_LIBRARIES freetype) + if(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES) + set(FREETYPE_FOUND TRUE) + endif(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES) endif(FREETYPECONFIG_EXECUTABLE) -- cgit v1.2.1 From e0005fe42a824d2f5ac88e3a136fcf58abb53201 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Thu, 20 Dec 2007 02:33:01 +0000 Subject: small change for non-pkgconfig configurations svn path=/trunk/KDE/kdelibs/; revision=750767 --- modules/FindFreetype.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 89b70a61..fae1a65c 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -49,9 +49,7 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" ) else(FREETYPECONFIG_EXECUTABLE) - find_path (FREETYPE_INCLUDE_DIR freetype/freetype.h - ${CMAKE_INCLUDE_PATH}/freetype2 - ) + find_path (FREETYPE_INCLUDE_DIR freetype2/freetype/freetype.h) find_library(FREETYPE_LIBRARIES freetype) if(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES) set(FREETYPE_FOUND TRUE) -- cgit v1.2.1 From 6bfdd2f31a3d24a900d2f83a49e32d5ee5a9d8f3 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Thu, 20 Dec 2007 03:39:08 +0000 Subject: SVN_SILENT: okular works now with freetype-support for dvi svn path=/trunk/KDE/kdelibs/; revision=750771 --- modules/FindFreetype.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index fae1a65c..d2821931 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -50,6 +50,7 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) else(FREETYPECONFIG_EXECUTABLE) 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) -- cgit v1.2.1 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(-) (limited to 'modules/FindFreetype.cmake') 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 479eff683c78e06073afcbe008f35ba7eb348068 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 14 Apr 2008 19:51:24 +0000 Subject: remove CACHE STRING, which can cause problems. per Brad King. svn path=/trunk/KDE/kdelibs/; revision=797050 --- modules/FindFreetype.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 6fd1bb13..6c22bb1b 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -45,7 +45,7 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) endforeach(value) endif(FREETYPE_LIBRARIES AND _freetype_pkgconfig_output) - set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE STRING "The libraries for freetype" ) + set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} ) mark_as_advanced(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) -- cgit v1.2.1 From 587e948530beed0f013eb7f68ac95e3cca3eea51 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 21 Apr 2008 17:27:57 +0000 Subject: use the wonderful magic of 'PATH_SUFFIXES' to not forget about 'freetype2' directory anymore svn path=/trunk/KDE/kdelibs/; revision=799493 --- modules/FindFreetype.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 6c22bb1b..5657728a 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -50,7 +50,7 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) mark_as_advanced(FREETYPE_LIBRARIES FREETYPE_INCLUDE_DIR) else(FREETYPECONFIG_EXECUTABLE) - find_path (FREETYPE_INCLUDE_DIR freetype2/freetype/freetype.h) + find_path (FREETYPE_INCLUDE_DIR freetype/freetype.h PATH_SUFFIXES freetype2) set (FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR}/freetype2) find_library(FREETYPE_LIBRARIES freetype) if(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES) -- cgit v1.2.1 From 9f5e34c981df3f3636a2411113c804a9fc6b3905 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 21 Apr 2008 17:34:27 +0000 Subject: SVN_SILENT: forgot to remove this line - no longer needed svn path=/trunk/KDE/kdelibs/; revision=799496 --- modules/FindFreetype.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/FindFreetype.cmake') diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 5657728a..61e44a1f 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -51,7 +51,6 @@ else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) else(FREETYPECONFIG_EXECUTABLE) find_path (FREETYPE_INCLUDE_DIR freetype/freetype.h PATH_SUFFIXES freetype2) - set (FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR}/freetype2) find_library(FREETYPE_LIBRARIES freetype) if(FREETYPE_INCLUDE_DIR AND FREETYPE_LIBRARIES) set(FREETYPE_FOUND TRUE) -- cgit v1.2.1