diff options
| author | Matthias Kretz <kretz@kde.org> | 2008-05-27 10:06:02 +0000 |
|---|---|---|
| committer | Matthias Kretz <kretz@kde.org> | 2008-05-27 10:06:02 +0000 |
| commit | 7fbeaf0032595d5dc342085e703fa04e4dd3b161 (patch) | |
| tree | 151e6b08648b5eebdd0a93bcf5b8bc55d5d43555 | |
| parent | 7cc2a87b06a869cc9564795d740024483e1bc82b (diff) | |
| download | extra-cmake-modules-7fbeaf0032595d5dc342085e703fa04e4dd3b161.tar.gz extra-cmake-modules-7fbeaf0032595d5dc342085e703fa04e4dd3b161.tar.bz2 | |
require Phonon: better error messages
svn path=/trunk/KDE/kdelibs/; revision=813267
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/FindPhonon.cmake | 28 |
2 files changed, 26 insertions, 4 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 0815afd8..782d4a76 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1116,7 +1116,7 @@ if (NOT _kde4_uninstall_rule_created) endif (NOT _kde4_uninstall_rule_created) -find_package(Phonon) +find_package(Phonon REQUIRED) set(KDE4_PHONON_LIBRARY ${PHONON_LIBRARY}) set(KDE4_PHONON_LIBS ${PHONON_LIBS}) set(KDE4_PHONON_INCLUDES ${PHONON_INCLUDES}) 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) |