[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2010-03-14 17:46:33
Message-ID: 1268588793.848558.16110.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1103254 by neundorf:

-unbreak: when using HINTS, NO_DEFAULT_PATHS etc. should not be used anymore...

Alex



 M  +2 -2      FindPhonon.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindPhonon.cmake #1103253:1103254
@@ -22,8 +22,8 @@
 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})


[prev in list] [next in list] [prev in thread] [next in thread]