diff options
author | Matthias Kretz <kretz@kde.org> | 2008-05-26 21:17:07 +0000 |
---|---|---|
committer | Matthias Kretz <kretz@kde.org> | 2008-05-26 21:17:07 +0000 |
commit | 5f6c8f71333d3fed146311b6983a15f6365ca266 (patch) | |
tree | 41608832c22097f7e11ba472c183e3091320a942 | |
parent | ae59452f0d2f9de347d36ccd50ac7afb16a70e97 (diff) | |
download | extra-cmake-modules-5f6c8f71333d3fed146311b6983a15f6365ca266.tar.gz extra-cmake-modules-5f6c8f71333d3fed146311b6983a15f6365ca266.tar.bz2 |
try harder to find the right directory
svn path=/trunk/KDE/kdelibs/; revision=813024
-rw-r--r-- | modules/FindPhonon.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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}) |