'Re: [Amarok] a7ccdb1: Make all unit tests build with the Gold Linker.'

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

List:       kde-commits
Subject:    Re: [Amarok] a7ccdb1: Make all unit tests build with the Gold Linker.
From:       Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date:       2010-08-23 13:59:55
Message-ID: AANLkTi=Dsx=Ojn+xsp_-ZjVvT1jT6hkbxVfiagYe19x6 () mail ! gmail ! com
[Download RAW message or body]

+                        ${KDE4_KDEUI_ILIBS}   ??

On Mon, Aug 23, 2010 at 1:06 PM, Mark Kretschmann <kretschmann@kde.org> wrote:
> commit a7ccdb1b0cb0e8b702041be98b968e02f3eb8167
> Author: Mark Kretschmann <kretschmann@kde.org>
> Date:   Mon Aug 23 11:25:49 2010 +0200
> 
> Make all unit tests build with the Gold Linker.
> 
> Gold is stricter than the GNU linker, so there were a lot of link targets
> missing. Also, some targets had spelling errors.
> 
> Happy lightning fast linking ;)
> 
> diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
> index 08ca027..6487d8b 100644
> --- a/tests/CMakeLists.txt
> +++ b/tests/CMakeLists.txt
> @@ -111,5 +111,5 @@ kde4_add_unit_test( testtrackorganizer  \
> ${testtrackorganizer_SRCS} ) add_dependencies( testtrackorganizer amarokcore )
> add_dependencies( testtrackorganizer amaroklib )
> 
> -target_link_libraries( testtrackorganizer amarokcore amaroklib \
> ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} \
> ${GOOGLEMOCK_LIBRARIES}) +target_link_libraries( testtrackorganizer amarokcore \
> amaroklib ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} \
> ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${GOOGLEMOCK_LIBRARIES}) 
> diff --git a/tests/amarokurls/CMakeLists.txt b/tests/amarokurls/CMakeLists.txt
> index d2ac8c6..6c5ed8f 100644
> --- a/tests/amarokurls/CMakeLists.txt
> +++ b/tests/amarokurls/CMakeLists.txt
> @@ -5,5 +5,5 @@ include_directories(
> 
> set( testamarokurls_SRCS TestAmarokUrls.cpp )
> kde4_add_unit_test( testamarokurls ${testamarokurls_SRCS} )
> -target_link_libraries( testamarokurls amaroklib ${KDE4_KDECORE_LIBS} \
> ${QT_QTTEST_LIBRARY} ) +target_link_libraries( testamarokurls amarokcore amaroklib \
> ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) 
> diff --git a/tests/context/engines/similarartists/CMakeLists.txt \
> b/tests/context/engines/similarartists/CMakeLists.txt index d1a01e5..4511d8c 100644
> --- a/tests/context/engines/similarartists/CMakeLists.txt
> +++ b/tests/context/engines/similarartists/CMakeLists.txt
> @@ -22,4 +22,4 @@ kde4_add_unit_test( testsimilarartistsengine \
> ${testsimilarartistsengine_SRCS} ) 
> add_dependencies( testsimilarartistsengine amaroklib)
> 
> -target_link_libraries( testsimilarartistsengine amaroklib ${KDE4_KDECORE_LIBS} \
> ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} ${LIBLASTFM_LIBRARY} \
> ${QT_QTTEST_LIBRARY}) +target_link_libraries( testsimilarartistsengine amarokcore \
> amaroklib ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} \
>                 ${KDE4_PLASMA_LIBS} ${LIBLASTFM_LIBRARY} ${QT_QTTEST_LIBRARY})
> diff --git a/tests/context/engines/upcomingevents/CMakeLists.txt \
> b/tests/context/engines/upcomingevents/CMakeLists.txt index 897dfb9..27dd1ca 100644
> --- a/tests/context/engines/upcomingevents/CMakeLists.txt
> +++ b/tests/context/engines/upcomingevents/CMakeLists.txt
> @@ -24,4 +24,4 @@ kde4_add_unit_test( testupcomingeventsengine \
> ${testupcomingeventsengine_SRCS} ) 
> add_dependencies( testupcomingeventsengine amaroklib)
> 
> -target_link_libraries( testupcomingeventsengine amaroklib ${KDE4_KDECORE_LIBS} \
> ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY}) \
> +target_link_libraries( testupcomingeventsengine amarokcore amaroklib \
> ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} \
>                 ${QT_QTTEST_LIBRARY})
> diff --git a/tests/core-impl/collections/sqlcollection/CMakeLists.txt \
> b/tests/core-impl/collections/sqlcollection/CMakeLists.txt index bc2e2aa..23f7e16 \
>                 100644
> --- a/tests/core-impl/collections/sqlcollection/CMakeLists.txt
> +++ b/tests/core-impl/collections/sqlcollection/CMakeLists.txt
> @@ -16,6 +16,8 @@ macro(link_database_test test_target)
> amaroklib
> amarok-sqlcollection
> ${KDE4_KDECORE_LIBS}
> +        ${KDE4_KIO_LIBS}
> +        ${KDE4_THREADWEAVER_LIBRARIES}
> ${KDE4_KDEUI_LIBS}
> ${QT_QTTEST_LIBRARY}
> ${QT_QTCORE_LIBRARY}
> @@ -244,6 +246,9 @@ target_link_libraries( testsqlcollectionlocation
> amaroklib
> amarok-sqlcollection
> ${KDE4_KDECORE_LIBS}
> +        ${KDE4_KIO_LIBS}
> +        ${KDE4_KDEUI_LIBS}
> +        ${KDE4_THREADWEAVER_LIBRARIES}
> ${QT_QTTEST_LIBRARY}
> ${QT_QTCORE_LIBRARY}
> ${MYSQL_EMBEDDED_LIBRARIES}
> diff --git a/tests/core-impl/meta/file/CMakeLists.txt \
> b/tests/core-impl/meta/file/CMakeLists.txt index e129326..4e8cf5c 100644
> --- a/tests/core-impl/meta/file/CMakeLists.txt
> +++ b/tests/core-impl/meta/file/CMakeLists.txt
> @@ -2,4 +2,4 @@
> 
> set( testmetafiletrack_SRCS TestMetaFileTrack.cpp )
> kde4_add_unit_test( testmetafiletrack ${testmetafiletrack_SRCS} )
> -target_link_libraries( testmetafiletrack ${QT_QTTEST_LIBRARY} amarokcore amaroklib \
> ) +target_link_libraries( testmetafiletrack ${QT_QTTEST_LIBRARY} \
>                 ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
> diff --git a/tests/core-impl/meta/multi/CMakeLists.txt \
> b/tests/core-impl/meta/multi/CMakeLists.txt index 3540039..8a51249 100644
> --- a/tests/core-impl/meta/multi/CMakeLists.txt
> +++ b/tests/core-impl/meta/multi/CMakeLists.txt
> @@ -34,6 +34,8 @@ target_link_libraries( testmetamultitrack
> amaroklib
> ${KDE4_KDECORE_LIBS}
> ${KDE4_KDEUI_LIBS}
> +    ${KDE4_KIO_LIBS}
> +    ${KDE4_PHONON_LIBRARY}
> ${QT_QTTEST_LIBRARY}
> ${QT_QTCORE_LIBRARY}
> ${GOOGLEMOCK_LIBRARIES}
> diff --git a/tests/core-impl/playlists/types/file/CMakeLists.txt \
> b/tests/core-impl/playlists/types/file/CMakeLists.txt index d8ff821..d1d4dac 100644
> --- a/tests/core-impl/playlists/types/file/CMakeLists.txt
> +++ b/tests/core-impl/playlists/types/file/CMakeLists.txt
> @@ -7,19 +7,19 @@ include_directories( .
> 
> set( testm3uplaylist_SRCS m3u/TestM3UPlaylist.cpp )
> kde4_add_unit_test( testm3uplaylist ${testm3uplaylist_SRCS} )
> -target_link_libraries( testm3uplaylist ${QT_QTTEST_LIBRARY} amarokcore amaroklib )
> +target_link_libraries( testm3uplaylist ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} \
> ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib ) 
> #------------------------ Test PLSPlaylist -----------------------------
> 
> set( testplsplaylist_SRCS pls/TestPLSPlaylist.cpp )
> kde4_add_unit_test( testplsplaylist ${testplsplaylist_SRCS} )
> -target_link_libraries( testplsplaylist ${QT_QTTEST_LIBRARY} amarokcore amaroklib )
> +target_link_libraries( testplsplaylist ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} \
> ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) 
> #------------------------ Test XSPFPLAYLIST -----------------------------
> 
> set( testxspfplaylist_SRCS xspf/TestXSPFPlaylist.cpp )
> kde4_add_unit_test( testxspfplaylist ${testxspfplaylist_SRCS} )
> -target_link_libraries( testxspfplaylist ${QT_QTTEST_LIBRARY} amarokcore amaroklib \
> ) +target_link_libraries( testxspfplaylist ${KDE4_KDECORE_LIBS} \
> ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) 
> #------------------------ Test PlaylistFileSupport -----------------------------
> 
> @@ -28,5 +28,5 @@ set( testplaylistfilesupport_SRCS
> ${AMAROK_SOURCE_TREE}/core-impl/playlists/types/file/PlaylistFileSupport.cpp
> )
> kde4_add_unit_test( testplaylistfilesupport ${testplaylistfilesupport_SRCS} )
> -target_link_libraries( testplaylistfilesupport ${QT_QTTEST_LIBRARY} amarokcore \
> amaroklib ) +target_link_libraries( testplaylistfilesupport ${KDE4_KDECORE_LIBS} \
> ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib ) 
> diff --git a/tests/playlist/CMakeLists.txt b/tests/playlist/CMakeLists.txt
> index 83917cf..0b61761 100644
> --- a/tests/playlist/CMakeLists.txt
> +++ b/tests/playlist/CMakeLists.txt
> @@ -37,9 +37,12 @@ kde4_add_unit_test( testplaylistmodels \
> ${testplaylistmodels_SRCS} ) add_dependencies( testplaylistmodels amaroklib )
> 
> target_link_libraries( testplaylistmodels
> +    amarokcore
> amaroklib
> ${KDE4_KDECORE_LIBS}
> ${KDE4_KDEUI_LIBS}
> +    ${KDE4_KIO_LIBS}
> +    ${KDE4_PHONON_LIBRARY}
> ${QT_QTTEST_LIBRARY}
> ${QT_QTCORE_LIBRARY}
> ${GOOGLEMOCK_LIBRARIES}
> diff --git a/tests/playlistmanager/file/CMakeLists.txt \
> b/tests/playlistmanager/file/CMakeLists.txt index 2d62db9..8ac1c95 100644
> --- a/tests/playlistmanager/file/CMakeLists.txt
> +++ b/tests/playlistmanager/file/CMakeLists.txt
> @@ -21,4 +21,4 @@ set( testplaylistfileprovider_SRCS
> ${AMAROK_SOURCE_TREE}/core-impl/playlists/types/file/PlaylistFileSupport.cpp
> )
> kde4_add_unit_test( testplaylistfileprovider ${testplaylistfileprovider_SRCS} )
> -target_link_libraries( testplaylistfileprovider ${QT_QTTEST_LIBRARY} amaroklib )
> +target_link_libraries( testplaylistfileprovider ${KDE4_KDEUI_LIBS} \
>                 ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} \
>                 amarokcore amaroklib )
> diff --git a/tests/playlistmanager/sql/CMakeLists.txt \
> b/tests/playlistmanager/sql/CMakeLists.txt index 35465b7..96bb239 100644
> --- a/tests/playlistmanager/sql/CMakeLists.txt
> +++ b/tests/playlistmanager/sql/CMakeLists.txt
> @@ -17,4 +17,4 @@ set( testsqluserplaylistprovider_SRCS
> ${AMAROK_SOURCE_TREE}/core-impl/playlists/types/file/PlaylistFileSupport.cpp
> )
> kde4_add_unit_test( testsqluserplaylistprovider ${testsqluserplaylistprovider_SRCS} \
>                 )
> -target_link_libraries( testsqluserplaylistprovider ${QT_QTTEST_LIBRARY} amaroklib \
> ) +target_link_libraries( testsqluserplaylistprovider ${KDE4_KDEUI_LIBS} \
>                 ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} \
>                 amarokcore amaroklib )
> diff --git a/tests/synchronization/CMakeLists.txt \
> b/tests/synchronization/CMakeLists.txt index 880586a..b7e4d43 100644
> --- a/tests/synchronization/CMakeLists.txt
> +++ b/tests/synchronization/CMakeLists.txt
> @@ -40,7 +40,8 @@ target_link_libraries(testmasterslavesynchronizationjob
> amarokcore
> amaroklib
> ${KDE4_KDECORE_LIBS}
> -                        ${KDE4_KDEUI_LIBS}
> +                        ${KDE4_KIO_LIBS}
> +                        ${KDE4_KDEUI_ILIBS}
> ${QT_QTGUI_LIBRARY}
> ${KDE4_THREADWEAVER_LIBRARIES}
> ${QT_QTTEST_LIBRARY}
> @@ -77,6 +78,7 @@ target_link_libraries(testunionjob
> amarokcore
> amaroklib
> ${KDE4_KDECORE_LIBS}
> +                        ${KDE4_KIO_LIBS}
> ${KDE4_KDEUI_LIBS}
> ${QT_QTGUI_LIBRARY}
> ${KDE4_THREADWEAVER_LIBRARIES}
> @@ -114,6 +116,7 @@ target_link_libraries(testonewaysynchronizationjob
> amarokcore
> amaroklib
> ${KDE4_KDECORE_LIBS}
> +                        ${KDE4_KIO_LIBS}
> ${KDE4_KDEUI_LIBS}
> ${QT_QTGUI_LIBRARY}
> ${KDE4_THREADWEAVER_LIBRARIES}
> diff --git a/tests/timecode/CMakeLists.txt b/tests/timecode/CMakeLists.txt
> index 8d981a2..e595c6b 100644
> --- a/tests/timecode/CMakeLists.txt
> +++ b/tests/timecode/CMakeLists.txt
> @@ -14,4 +14,4 @@ set( testtimecodetrackprovider_SRCS
> 
> kde4_add_unit_test( testtimecodetrackprovider ${testtimecodetrackprovider_SRCS} )
> 
> -target_link_libraries(testtimecodetrackprovider ${QT_QTTEST_LIBRARY} amaroklib )
> +target_link_libraries(testtimecodetrackprovider ${KDE4_KDECORE_LIBS} \
> ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib \
> ) 


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic