From 9cbf3bdee61f90d453eed7e2ffa4d7cca55a4563 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 26 May 2008 20:11:56 +0000 Subject: find and use installed Phonon svn path=/trunk/KDE/kdelibs/; revision=813005 --- modules/FindPhonon.cmake | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/FindPhonon.cmake (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake new file mode 100644 index 00000000..54206a04 --- /dev/null +++ b/modules/FindPhonon.cmake @@ -0,0 +1,28 @@ +# Find libphonon +# Once done this will define +# +# PHONON_FOUND - system has Phonon Library +# PHONON_INCLUDES - the Phonon include directory +# PHONON_LIBS - link these to use Phonon + +# Copyright (c) 2008, Matthias Kretz +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if(PHONON_FOUND) + # Already found, nothing more to do +else(PHONON_FOUND) + if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) + set(PHONON_FIND_QUIETLY TRUE) + endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) + + find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} ${LIB_INSTALL_DIR} NO_DEFAULT_PATH) + set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) + + find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH) + mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) + + set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) + message(STATUS "Found Phonon: ${PHONON_LIBRARY}) +endif(PHONON_FOUND) -- cgit v1.2.1 From ae59452f0d2f9de347d36ccd50ac7afb16a70e97 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 26 May 2008 20:23:06 +0000 Subject: ups svn path=/trunk/KDE/kdelibs/; revision=813013 --- modules/FindPhonon.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 54206a04..42a65642 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -24,5 +24,5 @@ else(PHONON_FOUND) mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) - message(STATUS "Found Phonon: ${PHONON_LIBRARY}) + message(STATUS "Found Phonon: ${PHONON_LIBRARY}") endif(PHONON_FOUND) -- cgit v1.2.1 From 5f6c8f71333d3fed146311b6983a15f6365ca266 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 26 May 2008 21:17:07 +0000 Subject: try harder to find the right directory svn path=/trunk/KDE/kdelibs/; revision=813024 --- modules/FindPhonon.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 42a65642..898931a2 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -17,10 +17,10 @@ else(PHONON_FOUND) set(PHONON_FIND_QUIETLY TRUE) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} ${LIB_INSTALL_DIR} NO_DEFAULT_PATH) + find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR} ${CMAKE_SYSTEM_LIBRARY_PATH} ${QT_LIBRARY_DIR} ${LIB_INSTALL_DIR} NO_DEFAULT_PATH) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) - find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH) + find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} ${CMAKE_SYSTEM_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH) mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) -- cgit v1.2.1 From 7fbeaf0032595d5dc342085e703fa04e4dd3b161 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Tue, 27 May 2008 10:06:02 +0000 Subject: require Phonon: better error messages svn path=/trunk/KDE/kdelibs/; revision=813267 --- modules/FindPhonon.cmake | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 898931a2..4ad5c250 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -18,11 +18,33 @@ else(PHONON_FOUND) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR} ${CMAKE_SYSTEM_LIBRARY_PATH} ${QT_LIBRARY_DIR} ${LIB_INSTALL_DIR} NO_DEFAULT_PATH) - set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} ${CMAKE_SYSTEM_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH) mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) - set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) - message(STATUS "Found Phonon: ${PHONON_LIBRARY}") + if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) + set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) + set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) + set(PHONON_FOUND TRUE) + else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) + set(PHONON_FOUND FALSE) + endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) + + if(PHONON_FOUND) + if(NOT PHONON_FIND_QUIETLY) + message(STATUS "Found Phonon: ${PHONON_LIBRARY}") + endif(NOT PHONON_FIND_QUIETLY) + else(PHONON_FOUND) + if(Phonon_FIND_REQUIRED) + if(NOT PHONON_INCLUDE_DIR) + message(STATUS "Phonon includes NOT found!") + endif(NOT PHONON_INCLUDE_DIR) + if(NOT PHONON_LIBRARY) + message(STATUS "Phonon library NOT found!") + endif(NOT PHONON_LIBRARY) + message(FATAL_ERROR "Phonon library or includes NOT found!") + else(Phonon_FIND_REQUIRED) + message(STATUS "Unable to find Phonon") + endif(Phonon_FIND_REQUIRED) + endif(PHONON_FOUND) endif(PHONON_FOUND) -- cgit v1.2.1 From ea15a691f07e83c7b1251a96e3757b1e26e7469c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 28 May 2008 13:10:21 +0000 Subject: also mention where the includes were found and mark it as advanced svn path=/trunk/KDE/kdelibs/; revision=813677 --- modules/FindPhonon.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 4ad5c250..092a3a69 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -20,7 +20,6 @@ else(PHONON_FOUND) find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR} ${CMAKE_SYSTEM_LIBRARY_PATH} ${QT_LIBRARY_DIR} ${LIB_INSTALL_DIR} NO_DEFAULT_PATH) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} ${CMAKE_SYSTEM_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH) - mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) @@ -33,6 +32,7 @@ else(PHONON_FOUND) if(PHONON_FOUND) if(NOT PHONON_FIND_QUIETLY) message(STATUS "Found Phonon: ${PHONON_LIBRARY}") + message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}") endif(NOT PHONON_FIND_QUIETLY) else(PHONON_FOUND) if(Phonon_FIND_REQUIRED) @@ -47,4 +47,7 @@ else(PHONON_FOUND) message(STATUS "Unable to find Phonon") endif(Phonon_FIND_REQUIRED) endif(PHONON_FOUND) + + + mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES) endif(PHONON_FOUND) -- cgit v1.2.1 From 802286e79e903fffd69398af3b1940f0247f649f Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 4 Jun 2008 22:13:58 +0000 Subject: Make it possible to specify where phonon is (e.g. using CMAKE_PREFIX_PATH with cmake-2.6, or CMAKE_LIBRARY_PATH with 2.4) : As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir) then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.). Brad says the next version of cmake will have a more convenient way of implementing this search order. svn path=/trunk/KDE/kdelibs/; revision=816902 --- modules/FindPhonon.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 092a3a69..b6a6b0a7 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -17,9 +17,13 @@ else(PHONON_FOUND) set(PHONON_FIND_QUIETLY TRUE) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR} ${CMAKE_SYSTEM_LIBRARY_PATH} ${QT_LIBRARY_DIR} ${LIB_INSTALL_DIR} NO_DEFAULT_PATH) + # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir) + find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.) + find_library(PHONON_LIBRARY NAMES phonon) - find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} ${CMAKE_SYSTEM_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_DEFAULT_PATH) + find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) -- cgit v1.2.1 From 8b841ab2477b2d43601ed57cad3f11b82dab8fd7 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 4 Jun 2008 22:56:14 +0000 Subject: don't search in KDE4_LIB_DIR and KDE4_INCLUDE_DIR, since they point to the kdelibs build/source dir when used inside kdelibs, KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR should always have the same value, but be empty inside kdelibs. Alex svn path=/trunk/KDE/kdelibs/; revision=816915 --- modules/FindPhonon.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index b6a6b0a7..14d15422 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -18,11 +18,11 @@ else(PHONON_FOUND) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir) - find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${KDE4_LIB_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.) find_library(PHONON_LIBRARY NAMES phonon) - find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) -- cgit v1.2.1 From 9fa39a6c1756f33fefc331ae4204087d68092b53 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Tue, 18 Nov 2008 22:35:17 +0000 Subject: figure out the Phonon version and put it in PHONON_VERSION svn path=/trunk/KDE/kdelibs/; revision=886287 --- modules/FindPhonon.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 14d15422..4d015129 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -4,14 +4,23 @@ # PHONON_FOUND - system has Phonon Library # PHONON_INCLUDES - the Phonon include directory # PHONON_LIBS - link these to use Phonon +# PHONON_VERSION - the version of the Phonon Library # Copyright (c) 2008, Matthias Kretz # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +macro(_phonon_find_version) + file(READ "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h" _phonon_header LIMIT 5000 OFFSET 1000) + string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}") + #set(PHONON_VERSION "${CMAKE_MATCH_1}") + message(STATUS "Phonon Version: ${PHONON_VERSION}") +endmacro(_phonon_find_version) + if(PHONON_FOUND) - # Already found, nothing more to do + # Already found, nothing more to do except figuring out the version + _phonon_find_version() else(PHONON_FOUND) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_FIND_QUIETLY TRUE) @@ -29,6 +38,7 @@ else(PHONON_FOUND) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) set(PHONON_FOUND TRUE) + _phonon_find_version() else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_FOUND FALSE) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) -- cgit v1.2.1 From e0109ea9c73f23d308d43dac6e8aec49a734ca38 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Wed, 3 Dec 2008 17:12:34 +0000 Subject: I have no idea why that line is commented out... svn path=/trunk/KDE/kdelibs/; revision=892147 --- modules/FindPhonon.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 4d015129..93332697 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -14,7 +14,7 @@ macro(_phonon_find_version) file(READ "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h" _phonon_header LIMIT 5000 OFFSET 1000) string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}") - #set(PHONON_VERSION "${CMAKE_MATCH_1}") + set(PHONON_VERSION "${CMAKE_MATCH_1}") message(STATUS "Phonon Version: ${PHONON_VERSION}") endmacro(_phonon_find_version) -- cgit v1.2.1 From 5363f85ae5e6be164e1bb32164f45c41800fb520 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 2 Jun 2009 21:19:45 +0000 Subject: if PHONON_INCLUDE_DIR is a framework directory on Mac OS X, we need to include the Headers/ subdir to read the .h file directly svn path=/trunk/KDE/kdelibs/; revision=976874 --- modules/FindPhonon.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 93332697..e9d45f0b 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -12,7 +12,11 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. macro(_phonon_find_version) - file(READ "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h" _phonon_header LIMIT 5000 OFFSET 1000) + set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h") + if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h") + set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h") + endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h") + file(READ _phonon_namespace_header_file _phonon_header LIMIT 5000 OFFSET 1000) string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}") set(PHONON_VERSION "${CMAKE_MATCH_1}") message(STATUS "Phonon Version: ${PHONON_VERSION}") -- cgit v1.2.1 From 752d23e59dd11f71763cc1c72dad30a2cc0964a7 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 2 Jun 2009 21:23:43 +0000 Subject: it helps to check in the right file when editing in 2 different places :P svn path=/trunk/KDE/kdelibs/; revision=976876 --- modules/FindPhonon.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index e9d45f0b..33faaada 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -13,10 +13,10 @@ macro(_phonon_find_version) set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h") - if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h") - set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h") - endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h") - file(READ _phonon_namespace_header_file _phonon_header LIMIT 5000 OFFSET 1000) + if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") + set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") + endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") + file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000) string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}") set(PHONON_VERSION "${CMAKE_MATCH_1}") message(STATUS "Phonon Version: ${PHONON_VERSION}") -- cgit v1.2.1 From 3557fbb0ab929c40e0ff437af2e0dfa7a58a589e Mon Sep 17 00:00:00 2001 From: Mike Arthur Date: Tue, 1 Dec 2009 16:17:08 +0000 Subject: Find Phonon include directory on Qt with Frameworks. svn path=/trunk/KDE/kdelibs/; revision=1057166 --- modules/FindPhonon.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 33faaada..daa457ad 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -35,7 +35,7 @@ else(PHONON_FOUND) # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.) find_library(PHONON_LIBRARY NAMES phonon) - find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) -- cgit v1.2.1 From 35342e6c7ad882f14e12bf96ce2f6e39e82e5aa1 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 14 Mar 2010 13:56:28 +0000 Subject: -simplify FindPhonon.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=1103155 --- modules/FindPhonon.cmake | 55 ++++++++++-------------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index daa457ad..e24ffdce 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -22,50 +22,17 @@ macro(_phonon_find_version) message(STATUS "Phonon Version: ${PHONON_VERSION}") endmacro(_phonon_find_version) -if(PHONON_FOUND) - # Already found, nothing more to do except figuring out the version - _phonon_find_version() -else(PHONON_FOUND) - if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - set(PHONON_FIND_QUIETLY TRUE) - endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - - # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir) - find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) - # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.) - find_library(PHONON_LIBRARY NAMES phonon) - - find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) - find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h) +# the dirs listed with HINTS are searched before the default sets of dirs +find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) +find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) - if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) - set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) - set(PHONON_FOUND TRUE) - _phonon_find_version() - else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - set(PHONON_FOUND FALSE) - endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - - if(PHONON_FOUND) - if(NOT PHONON_FIND_QUIETLY) - message(STATUS "Found Phonon: ${PHONON_LIBRARY}") - message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}") - endif(NOT PHONON_FIND_QUIETLY) - else(PHONON_FOUND) - if(Phonon_FIND_REQUIRED) - if(NOT PHONON_INCLUDE_DIR) - message(STATUS "Phonon includes NOT found!") - endif(NOT PHONON_INCLUDE_DIR) - if(NOT PHONON_LIBRARY) - message(STATUS "Phonon library NOT found!") - endif(NOT PHONON_LIBRARY) - message(FATAL_ERROR "Phonon library or includes NOT found!") - else(Phonon_FIND_REQUIRED) - message(STATUS "Unable to find Phonon") - endif(Phonon_FIND_REQUIRED) - endif(PHONON_FOUND) +if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) + set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) + set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) + _phonon_find_version() +endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Phonon DEFAULT_MSG PHONON_INCLUDE_DIR PHONON_LIBRARY) - mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES) -endif(PHONON_FOUND) +mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) -- cgit v1.2.1 From 575ac8acb9ae2ea0b6112057487002be02330557 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 14 Mar 2010 15:31:41 +0000 Subject: -add a copy of FindPackageHandleStandardArgs, which adds checking the version numbers, so you get this automatically in all modules which use find_package_handle_standard_args() Alex svn path=/trunk/KDE/kdelibs/; revision=1103184 --- modules/FindPhonon.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index e24ffdce..85953cca 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -19,7 +19,6 @@ macro(_phonon_find_version) file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000) string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}") set(PHONON_VERSION "${CMAKE_MATCH_1}") - message(STATUS "Phonon Version: ${PHONON_VERSION}") endmacro(_phonon_find_version) # the dirs listed with HINTS are searched before the default sets of dirs -- cgit v1.2.1 From bebe865fcb9da07d5dee4ab55c622ba48df9390f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 14 Mar 2010 17:46:33 +0000 Subject: -unbreak: when using HINTS, NO_DEFAULT_PATHS etc. should not be used anymore... Alex svn path=/trunk/KDE/kdelibs/; revision=1103254 --- modules/FindPhonon.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindPhonon.cmake') diff --git a/modules/FindPhonon.cmake b/modules/FindPhonon.cmake index 85953cca..cd9e5cb4 100644 --- a/modules/FindPhonon.cmake +++ b/modules/FindPhonon.cmake @@ -22,8 +22,8 @@ macro(_phonon_find_version) endmacro(_phonon_find_version) # the dirs listed with HINTS are searched before the default sets of dirs -find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) -find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) +find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR}) +find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR}) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) -- cgit v1.2.1