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

List:       kde-commits
Subject:    [Phonon] 67b1b07: Remove KDE-related variables from the build system
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2011-01-06 16:45:33
Message-ID: 20110106164533.22B60A6090 () git ! kde ! org
[Download RAW message or body]

commit 67b1b0793dc7959887bbb80e2280c5bb3533acee
branch master
Author: Raphael Kubo da Costa <kubito@gmail.com>
Date:   Mon Oct 25 01:37:35 2010 -0200

    Remove KDE-related variables from the build system.
    
    Some variables such as PHONON_KDECORE_LIBS were still being used, even
    though Phonon should not depend on KDE. PHONON_KDECORE_LIBS was being
    defined in a wrong way (it did not look for kdecore), and others such
    as PHONON_KIO_LIBS were not defined at all.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c3080c..df7a278 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ if(QT_QTDBUS_FOUND)
     list(APPEND PHONON_LIBS phonon ${QT_QTDBUS_LIBRARY})
 endif(QT_QTDBUS_FOUND)
 
-set(PHONON_KDECORE_LIBS kdecore)
-
 add_subdirectory(phonon)
 add_subdirectory(includes)
 
diff --git a/phonon/experimental/tests/avcaptureapptest/CMakeLists.txt \
b/phonon/experimental/tests/avcaptureapptest/CMakeLists.txt index af9e4e5..264d016 \
                100644
--- a/phonon/experimental/tests/avcaptureapptest/CMakeLists.txt
+++ b/phonon/experimental/tests/avcaptureapptest/CMakeLists.txt
@@ -5,5 +5,5 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 # which is generated from phononnamespace.h.in
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/../..")
 phonon_add_executable(avcaptureapp capture_test_main.cpp capture_test.cpp)
-target_link_libraries(avcaptureapp ${PHONON_LIBS} phononexperimental \
${PHONON_KDECORE_LIBS}) +target_link_libraries(avcaptureapp ${PHONON_LIBS} \
phononexperimental)  set_target_properties(avcaptureapp PROPERTIES COMPILE_FLAGS \
                "-Wall -g")
diff --git a/phonon/tests/CMakeLists.txt b/phonon/tests/CMakeLists.txt
index 8a66168..bad7c08 100644
--- a/phonon/tests/CMakeLists.txt
+++ b/phonon/tests/CMakeLists.txt
@@ -63,10 +63,6 @@ PHONON_UNIT_TESTS_FAKE(
 	volumeslidertest
 	audiodataoutputtest
 )
-target_link_libraries(backendcapabilitiestest ${PHONON_KDECORE_LIBS})
-target_link_libraries(audiodevicelisttest ${PHONON_KAUDIODEVICELIST_LIBS})
-target_link_libraries(mediaplayer ${PHONON_KIO_LIBS})
-target_link_libraries(backendcapabilitiestest_fake ${PHONON_KDECORE_LIBS})
 #methodtest does not link against libphonon
 phonon_add_executable(methodtest methodtest.cpp ../factory.cpp
                                                 ../mediaobject.cpp
@@ -88,7 +84,7 @@ SET_TARGET_PROPERTIES(methodtest_fake PROPERTIES COMPILE_FLAGS \
"-DUSE_FAKE_BACKE  #audiodevicelisttest does not link agains libphonon, instead it \
links agains kde stuff  #libkaudiodevicelist building is disabled (commented out) in \
the kde sources, you must enable it there first, to use this test  \
                #phonon_add_executable(audiodevicelisttest audiodevicelisttest.cpp)
-#target_link_libraries(audiodevicelisttest ${QT_QTTEST_LIBRARY} \
${PHONON_KDECORE_LIBS} kaudiodevicelist) +#target_link_libraries(audiodevicelisttest \
${QT_QTTEST_LIBRARY} kaudiodevicelist)  
 SET(mediasourcetest_SRCS mediasourcetest.cpp)
 qt4_add_resources(mediasourcetest_SRCS testresources.qrc)


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