diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-06-04 22:56:14 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-06-04 22:56:14 +0000 |
| commit | 8b841ab2477b2d43601ed57cad3f11b82dab8fd7 (patch) | |
| tree | 2376ac071a182c9d78372437e20c810d5f62d9c1 /modules/FindPhonon.cmake | |
| parent | 802286e79e903fffd69398af3b1940f0247f649f (diff) | |
| download | extra-cmake-modules-8b841ab2477b2d43601ed57cad3f11b82dab8fd7.tar.gz extra-cmake-modules-8b841ab2477b2d43601ed57cad3f11b82dab8fd7.tar.bz2 | |
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
Diffstat (limited to 'modules/FindPhonon.cmake')
| -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 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) |