From b586df5f5ec51c1444f043929a36fe5f9baf5336 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 6 Nov 2006 17:29:11 +0000 Subject: copying the GLIB2 module from kdebase, as it's needed by kdemultimedia svn path=/trunk/KDE/kdelibs/; revision=602730 --- modules/FindGLIB2.cmake | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 modules/FindGLIB2.cmake (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake new file mode 100644 index 00000000..3dac5a4f --- /dev/null +++ b/modules/FindGLIB2.cmake @@ -0,0 +1,40 @@ +# - Try to find the GLIB2 libraries +# Once done this will define +# +# GLIB2_FOUND - system has glib2 +# GLIB2_INCLUDE_DIR - the glib2 include directory +# GLIB2_LIBRARIES - glib2 library + +if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) + # Already in cache, be silent + set(GLIB2_FIND_QUIETLY TRUE) +endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) + +INCLUDE(UsePkgConfig) +PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) + +FIND_PATH(GLIB2_INCLUDE_DIR glib.h + /usr/include/glib-2.0 + /usr/include + /usr/local/include/glib-2.0 + /usr/local/include +) + +FIND_LIBRARY(GLIB2_LIBRARIES NAMES glib-2.0 + PATHS + ${_libGLIB2LinkDir} + /usr/lib + /usr/local/lib +) + +if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) + set(GLIB2_FOUND TRUE) +endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) + +if(GLIB2_FOUND) + if(NOT GLIB2_FIND_QUIETLY) + message(STATUS "Found glib2: ${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}") + endif(NOT GLIB2_FIND_QUIETLY) +endif(GLIB2_FOUND) + +MARK_AS_ADVANCED(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) -- cgit v1.2.1 From 128c106c76423e7ecdb77f8f9b516cb033ef5dde Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 23 Nov 2006 21:46:19 +0000 Subject: minor fixes from Luca Gugelmann CCMAIL: lucag@student.ethz.ch svn path=/trunk/KDE/kdelibs/; revision=607264 --- modules/FindGLIB2.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 3dac5a4f..0dc5fe44 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -14,6 +14,7 @@ INCLUDE(UsePkgConfig) PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) FIND_PATH(GLIB2_INCLUDE_DIR glib.h + ${_LibGLIB2IncDir} /usr/include/glib-2.0 /usr/include /usr/local/include/glib-2.0 @@ -22,7 +23,7 @@ FIND_PATH(GLIB2_INCLUDE_DIR glib.h FIND_LIBRARY(GLIB2_LIBRARIES NAMES glib-2.0 PATHS - ${_libGLIB2LinkDir} + ${_LibGLIB2LinkDir} /usr/lib /usr/local/lib ) -- cgit v1.2.1 From a8cb4bf9d482b203573d182c3832160acefd64f8 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Mon, 1 Jan 2007 14:58:25 +0000 Subject: find glib2 here as well (opensuse 10.2) svn path=/trunk/KDE/kdelibs/; revision=618546 --- modules/FindGLIB2.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 0dc5fe44..749dd671 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -15,6 +15,7 @@ PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2 FIND_PATH(GLIB2_INCLUDE_DIR glib.h ${_LibGLIB2IncDir} + ${_LibGLIB2IncDir}/glib-2.0 /usr/include/glib-2.0 /usr/include /usr/local/include/glib-2.0 -- cgit v1.2.1 From 58a376c46e496cf3c57d82a45a998fc19b05b06b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 13 Jun 2007 19:09:44 +0000 Subject: don't try to use pkgconfig under Windows Minor fix svn path=/trunk/KDE/kdelibs/; revision=675150 --- modules/FindGLIB2.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 749dd671..5edbd7a4 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -9,9 +9,10 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) # Already in cache, be silent set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) - -INCLUDE(UsePkgConfig) -PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) +IF (NOT WIN32) + INCLUDE(UsePkgConfig) + PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) +endif(NOT WIN32) FIND_PATH(GLIB2_INCLUDE_DIR glib.h ${_LibGLIB2IncDir} @@ -37,6 +38,10 @@ if(GLIB2_FOUND) if(NOT GLIB2_FIND_QUIETLY) message(STATUS "Found glib2: ${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}") endif(NOT GLIB2_FIND_QUIETLY) +else(GLIB2_FOUND) + if (GLIB2_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find glib2 library") + endif (GLIB2_FIND_REQUIRED) endif(GLIB2_FOUND) MARK_AS_ADVANCED(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) -- cgit v1.2.1 From 9d5410493b0c4b2413f44f84d06bb847f2174fa8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Aug 2007 17:30:55 +0000 Subject: Remove not necessary path here too svn path=/trunk/KDE/kdelibs/; revision=697065 --- modules/FindGLIB2.cmake | 4 ---- 1 file changed, 4 deletions(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 5edbd7a4..65f65bea 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -18,16 +18,12 @@ FIND_PATH(GLIB2_INCLUDE_DIR glib.h ${_LibGLIB2IncDir} ${_LibGLIB2IncDir}/glib-2.0 /usr/include/glib-2.0 - /usr/include /usr/local/include/glib-2.0 - /usr/local/include ) FIND_LIBRARY(GLIB2_LIBRARIES NAMES glib-2.0 PATHS ${_LibGLIB2LinkDir} - /usr/lib - /usr/local/lib ) if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) -- cgit v1.2.1 From f078487d1b9e273d2b2af81cbaba6f1b6f65f92e Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 7 Aug 2007 02:11:45 +0000 Subject: -use PATH_SUFFIXES in FindGLIB2.cmake to make the command even shorter -remove unecessary search path for msgfmt Alex svn path=/trunk/KDE/kdelibs/; revision=697172 --- modules/FindGLIB2.cmake | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 65f65bea..bb4dc72f 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -9,35 +9,21 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) # Already in cache, be silent set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) -IF (NOT WIN32) - INCLUDE(UsePkgConfig) - PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) -endif(NOT WIN32) -FIND_PATH(GLIB2_INCLUDE_DIR glib.h - ${_LibGLIB2IncDir} - ${_LibGLIB2IncDir}/glib-2.0 - /usr/include/glib-2.0 - /usr/local/include/glib-2.0 -) +if (NOT WIN32) + include(UsePkgConfig) + pkgconfig(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) +endif(NOT WIN32) -FIND_LIBRARY(GLIB2_LIBRARIES NAMES glib-2.0 - PATHS - ${_LibGLIB2LinkDir} -) +find_path(GLIB2_INCLUDE_DIR glib.h + PATH_SUFFIXES glib-2.0 + PATHS ${_LibGLIB2IncDir} ) -if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) - set(GLIB2_FOUND TRUE) -endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) +find_library(GLIB2_LIBRARIES + NAMES glib-2.0 + PATHS ${_LibGLIB2LinkDir} ) -if(GLIB2_FOUND) - if(NOT GLIB2_FIND_QUIETLY) - message(STATUS "Found glib2: ${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}") - endif(NOT GLIB2_FIND_QUIETLY) -else(GLIB2_FOUND) - if (GLIB2_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find glib2 library") - endif (GLIB2_FIND_REQUIRED) -endif(GLIB2_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_INCLUDE_DIR) -MARK_AS_ADVANCED(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) +mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) -- cgit v1.2.1 From 44aff7160b5dce390bef2795849a0bcf7fc91ed6 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 31 Aug 2007 22:58:20 +0000 Subject: also search glibconfig.h Alex svn path=/trunk/KDE/kdelibs/; revision=707068 --- modules/FindGLIB2.cmake | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index bb4dc72f..c5bb604d 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -15,15 +15,30 @@ if (NOT WIN32) pkgconfig(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) endif(NOT WIN32) -find_path(GLIB2_INCLUDE_DIR glib.h +find_path(GLIB2_MAIN_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0 PATHS ${_LibGLIB2IncDir} ) +# search the glibconfig.h include dir under the same root where the library is found find_library(GLIB2_LIBRARIES NAMES glib-2.0 PATHS ${_LibGLIB2LinkDir} ) +get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) + +find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h + PATH_SUFFIXES glib-2.0/include + PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ) + +set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") + +# not sure if this include dir is optional or required +# for now it is optional +if(GLIB2_INTERNAL_INCLUDE_DIR) + set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}") +endif(GLIB2_INTERNAL_INCLUDE_DIR) + include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_INCLUDE_DIR) +find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR) mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) -- cgit v1.2.1 From e680617f2eb9de7188f1f219204f208377e300a5 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 1 Sep 2007 15:30:15 +0000 Subject: also search /usr/lib and /usr/local/lib for glibconfig.h svn path=/trunk/KDE/kdelibs/; revision=707341 --- modules/FindGLIB2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index c5bb604d..1f95b3a0 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -28,7 +28,7 @@ get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include - PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ) + PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" /usr/lib /usr/local/lib) set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") -- cgit v1.2.1 From 1deb8975ca3e58dae49b595e25d5f78950bea9d8 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 26 Sep 2007 14:01:18 +0000 Subject: install manpages and infopages into destdir/share svn path=/trunk/KDE/kdelibs/; revision=717270 --- modules/FindGLIB2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 1f95b3a0..3467562a 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -28,7 +28,7 @@ get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include - PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" /usr/lib /usr/local/lib) + PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") -- cgit v1.2.1 From 87c903a8e853eec433860818a01040da8d1c5f1a Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 4 Jan 2009 15:39:53 +0000 Subject: -add missing copyright notices, I hope I got it right -also a few empty lines here and there to make it look nicer Alex svn path=/trunk/KDE/kdelibs/; revision=905547 --- modules/FindGLIB2.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 3467562a..431f2e5e 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -5,6 +5,12 @@ # GLIB2_INCLUDE_DIR - the glib2 include directory # GLIB2_LIBRARIES - glib2 library +# Copyright (c) 2008 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(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) # Already in cache, be silent set(GLIB2_FIND_QUIETLY TRUE) -- cgit v1.2.1 From 5e7664ba04465f7156c4f564c3cc22ebf523caef Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 27 Apr 2010 22:53:42 +0000 Subject: changed: use PkgConfig instead of UsePkgConfig svn path=/trunk/KDE/kdelibs/; revision=1119905 --- modules/FindGLIB2.cmake | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'modules/FindGLIB2.cmake') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 431f2e5e..09fd98d8 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -16,25 +16,27 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) -if (NOT WIN32) - include(UsePkgConfig) - pkgconfig(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) -endif(NOT WIN32) +find_package(PkgConfig) +pkg_check_modules(PC_LibGLIB2 QUIET glib-2.0) -find_path(GLIB2_MAIN_INCLUDE_DIR glib.h - PATH_SUFFIXES glib-2.0 - PATHS ${_LibGLIB2IncDir} ) +find_path(GLIB2_MAIN_INCLUDE_DIR + NAMES glib.h + HINTS ${PC_LibGLIB2_INCLUDEDIR} + PATH_SUFFIXES glib-2.0) -# search the glibconfig.h include dir under the same root where the library is found -find_library(GLIB2_LIBRARIES +find_library(GLIB2_LIBRARY NAMES glib-2.0 - PATHS ${_LibGLIB2LinkDir} ) + HINTS ${PC_LibGLIB2_LIBDIR} +) + +set(GLIB2_LIBRARIES ${GLIB2_LIBRARY}) +# search the glibconfig.h include dir under the same root where the library is found get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include - PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) + HINTS ${PC_LibGLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") -- cgit v1.2.1