diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindPhonon.cmake | 8 | 
1 files changed, 6 insertions, 2 deletions
| 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}) | 
