[Amarok] Delete WITH_PREFIX for compilation on Windows. Not

Myriam Schweingruber schweingruber at pharma-traduction.ch
Tue Aug 25 18:16:03 CEST 2009 

Hi Casper,

FYI, we do not reference to KDE trunk currently, and we still use Qt
4.4. As long as this has not been decided otherwise, you should not
use unstable dependencies.


Regards, Myriam

On Tue, Aug 25, 2009 at 16:48, Maximilian
Kossick<maximilian.kossick at googlemail.com> wrote:
> 4.3.0
>
> the plugin name is referenced in the .desktop files. removing the lib
> prefix from those entries is likely going to fix this.
>
> On Tue, Aug 25, 2009 at 4:48 PM, Casper van
> Donderen<casper.vandonderen at gmail.com> wrote:
>> Hmm. What to do. Should I revert the commit? Which version of KDE are you running?
>>
>> Casper
>> -----Original Message-----
>> From: Maximilian Kossick <maximilian.kossick at googlemail.com>
>>
>> Date: Tue, 25 Aug 2009 16:41:32
>> To: <kde-commits at kde.org>; <casper.vandonderen at gmail.com>; Amarok Devel<amarok-devel at kde.org>
>> Subject: Re: [Amarok] Delete WITH_PREFIX for compilation on Windows. Not
>>
>>
>> and breaks horribly on OS X. You might be able to fix this by updating
>> the X-KDE_Library property in the .desktop files for all those plugins
>>
>> On Tue, Aug 25, 2009 at 2:18 PM, Casper van
>> Donderen<casper.vandonderen at gmail.com> wrote:
>>> commit 54f5fff16ba2eb6d3fb3e52d61a1ffadeb801b4a
>>> Author:     Casper van Donderen <casper.vandonderen at gmail.com>
>>> AuthorDate: Tue Aug 25 12:46:05 2009 +0200
>>> Commit:     Casper van Donderen <casper.vandonderen at gmail.com>
>>> CommitDate: Tue Aug 25 14:15:09 2009 +0200
>>>
>>>    Delete WITH_PREFIX for compilation on Windows.
>>>    Not tested against non-trunk kdelibs.
>>>
>>> diff --git a/src/collection/audiocd/CMakeLists.txt b/src/collection/audiocd/CMakeLists.txt
>>> index e391025..060974c 100644
>>> --- a/src/collection/audiocd/CMakeLists.txt
>>> +++ b/src/collection/audiocd/CMakeLists.txt
>>> @@ -26,7 +26,7 @@ include_directories( ../..
>>>         kde4_add_ui_files(amarok_collection-audiocdcollection_PART_SRCS FormatSelectionDialog.ui)
>>>
>>>
>>> -        kde4_add_plugin(amarok_collection-audiocdcollection WITH_PREFIX ${amarok_collection-audiocdcollection_PART_SRCS})
>>> +        kde4_add_plugin(amarok_collection-audiocdcollection ${amarok_collection-audiocdcollection_PART_SRCS})
>>>
>>>         target_link_libraries( amarok_collection-audiocdcollection amaroklib amarokpud ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDNSSD_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_SOLID_LIBRARY} )
>>>
>>> diff --git a/src/collection/daap/CMakeLists.txt b/src/collection/daap/CMakeLists.txt
>>> index 45b3044..0223266 100644
>>> --- a/src/collection/daap/CMakeLists.txt
>>> +++ b/src/collection/daap/CMakeLists.txt
>>> @@ -20,7 +20,7 @@ set(amarok_collection-daapcollection_PART_SRCS
>>>    daapreader/authentication/hasher.c
>>>    daapreader/authentication/md5.c )
>>>
>>> -kde4_add_plugin(amarok_collection-daapcollection WITH_PREFIX ${amarok_collection-daapcollection_PART_SRCS})
>>> +kde4_add_plugin(amarok_collection-daapcollection ${amarok_collection-daapcollection_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_collection-daapcollection
>>>     amaroklib
>>> diff --git a/src/collection/device/massstorage/CMakeLists.txt b/src/collection/device/massstorage/CMakeLists.txt
>>> index 5cc8e4f..b265a35 100644
>>> --- a/src/collection/device/massstorage/CMakeLists.txt
>>> +++ b/src/collection/device/massstorage/CMakeLists.txt
>>> @@ -13,7 +13,7 @@ include_directories(
>>>
>>>  set(amarok_massstorage-device_PART_SRCS MassStorageDeviceHandler.cpp )
>>>
>>> -kde4_add_plugin(amarok_massstorage-device WITH_PREFIX
>>> +kde4_add_plugin(amarok_massstorage-device
>>>  ${amarok_massstorage-device_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_massstorage-device
>>> diff --git a/src/collection/device/nfs/CMakeLists.txt b/src/collection/device/nfs/CMakeLists.txt
>>> index 1eb059f..6807dd6 100644
>>> --- a/src/collection/device/nfs/CMakeLists.txt
>>> +++ b/src/collection/device/nfs/CMakeLists.txt
>>> @@ -6,7 +6,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../..
>>>
>>>  set(amarok_nfs-device_PART_SRCS NfsDeviceHandler.cpp )
>>>
>>> -kde4_add_plugin(amarok_nfs-device WITH_PREFIX
>>> +kde4_add_plugin(amarok_nfs-device
>>>  ${amarok_nfs-device_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_nfs-device amarok ${KDE4_KDECORE_LIBS} )
>>> diff --git a/src/collection/device/smb/CMakeLists.txt b/src/collection/device/smb/CMakeLists.txt
>>> index b9dbc70..fc27d5a 100644
>>> --- a/src/collection/device/smb/CMakeLists.txt
>>> +++ b/src/collection/device/smb/CMakeLists.txt
>>> @@ -6,7 +6,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../..
>>>
>>>  set(amarok_smb-device_PART_SRCS SmbDeviceHandler.cpp )
>>>
>>> -kde4_add_plugin(amarok_smb-device WITH_PREFIX
>>> +kde4_add_plugin(amarok_smb-device
>>>  ${amarok_smb-device_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_smb-device amarok  ${KDE4_KDECORE_LIBS} )
>>> diff --git a/src/collection/iphoneos/CMakeLists.txt b/src/collection/iphoneos/CMakeLists.txt
>>> index 99ed01b..9c6cd81 100644
>>> --- a/src/collection/iphoneos/CMakeLists.txt
>>> +++ b/src/collection/iphoneos/CMakeLists.txt
>>> @@ -30,7 +30,7 @@ set(amarok_collection-iphoneoscollection_PART_SRCS
>>>    handler/capabilities/IphoneOsPlaylistCapability.cpp
>>>    )
>>>
>>> -kde4_add_plugin(amarok_collection-iphoneoscollection WITH_PREFIX
>>> +kde4_add_plugin(amarok_collection-iphoneoscollection
>>>    ${amarok_collection-iphoneoscollection_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_collection-iphoneoscollection
>>> diff --git a/src/collection/ipodcollection/CMakeLists.txt b/src/collection/ipodcollection/CMakeLists.txt
>>> index 3bdb128..81ea987 100644
>>> --- a/src/collection/ipodcollection/CMakeLists.txt
>>> +++ b/src/collection/ipodcollection/CMakeLists.txt
>>> @@ -47,7 +47,7 @@ if (IPOD_FOUND AND IPOD_0_7 AND WITH_Ipod)
>>>        handler/capabilities/IpodWriteCapability.cpp
>>>        support/IpodDeviceInfo.cpp
>>>        support/IpodConnectionAssistant.cpp)
>>> -       kde4_add_plugin(amarok_collection-ipodcollection WITH_PREFIX ${amarok_collection-ipodcollection_PART_SRCS})
>>> +       kde4_add_plugin(amarok_collection-ipodcollection ${amarok_collection-ipodcollection_PART_SRCS})
>>>
>>>     target_link_libraries(amarok_collection-ipodcollection
>>>         amaroklib
>>> diff --git a/src/collection/mtpcollection/CMakeLists.txt b/src/collection/mtpcollection/CMakeLists.txt
>>> index 0012b90..225184c 100644
>>> --- a/src/collection/mtpcollection/CMakeLists.txt
>>> +++ b/src/collection/mtpcollection/CMakeLists.txt
>>> @@ -35,7 +35,7 @@ if (MTP_FOUND)
>>>        handler/capabilities/MtpWriteCapability.cpp
>>>        support/MtpDeviceInfo.cpp
>>>        support/MtpConnectionAssistant.cpp)
>>> -       kde4_add_plugin(amarok_collection-mtpcollection WITH_PREFIX ${amarok_collection-mtpcollection_PART_SRCS})
>>> +       kde4_add_plugin(amarok_collection-mtpcollection ${amarok_collection-mtpcollection_PART_SRCS})
>>>
>>>        target_link_libraries(amarok_collection-mtpcollection
>>>         amaroklib
>>> diff --git a/src/collection/mysqlecollection/CMakeLists.txt b/src/collection/mysqlecollection/CMakeLists.txt
>>> index 82699ba..ed078ab 100755
>>> --- a/src/collection/mysqlecollection/CMakeLists.txt
>>> +++ b/src/collection/mysqlecollection/CMakeLists.txt
>>> @@ -49,7 +49,7 @@ qt4_add_dbus_adaptor( amarok_collection-mysqlecollection_PART_SRCS
>>>     SqlCollectionDBusHandler SqlCollectionAdaptor
>>>     SqlCollectionAdaptor)
>>>
>>> -kde4_add_plugin(amarok_collection-mysqlecollection WITH_PREFIX ${amarok_collection-mysqlecollection_PART_SRCS})
>>> +kde4_add_plugin(amarok_collection-mysqlecollection ${amarok_collection-mysqlecollection_PART_SRCS})
>>>
>>>  STRING(REPLACE "-Wl,--fatal-warnings" "" CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN ${CMAKE_SHARED_LINKER_FLAGS})
>>>  SET(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN} )
>>> diff --git a/src/collection/mysqlservercollection/CMakeLists.txt b/src/collection/mysqlservercollection/CMakeLists.txt
>>> index 3869258..9f1c390 100755
>>> --- a/src/collection/mysqlservercollection/CMakeLists.txt
>>> +++ b/src/collection/mysqlservercollection/CMakeLists.txt
>>> @@ -49,7 +49,7 @@ qt4_add_dbus_adaptor( amarok_collection-mysqlservercollection_PART_SRCS
>>>     SqlCollectionDBusHandler SqlCollectionAdaptor
>>>     SqlCollectionAdaptor)
>>>
>>> -kde4_add_plugin(amarok_collection-mysqlservercollection WITH_PREFIX ${amarok_collection-mysqlservercollection_PART_SRCS})
>>> +kde4_add_plugin(amarok_collection-mysqlservercollection ${amarok_collection-mysqlservercollection_PART_SRCS})
>>>
>>>  STRING(REPLACE "-Wl,--fatal-warnings" "" CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN ${CMAKE_SHARED_LINKER_FLAGS})
>>>  SET(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN} )
>>> diff --git a/src/collection/nepomukcollection/CMakeLists.txt b/src/collection/nepomukcollection/CMakeLists.txt
>>> index f0a0406..707a660 100644
>>> --- a/src/collection/nepomukcollection/CMakeLists.txt
>>> +++ b/src/collection/nepomukcollection/CMakeLists.txt
>>> @@ -32,7 +32,7 @@ set(amarok_collection-nepomukcollection_PART_SRCS
>>>  #   ./search-api/searchresult.cpp
>>>
>>>
>>> -kde4_add_plugin(amarok_collection-nepomukcollection WITH_PREFIX ${amarok_collection-nepomukcollection_PART_SRCS})
>>> +kde4_add_plugin(amarok_collection-nepomukcollection ${amarok_collection-nepomukcollection_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_collection-nepomukcollection
>>>     amaroklib
>>> diff --git a/src/collection/umscollection/CMakeLists.txt b/src/collection/umscollection/CMakeLists.txt
>>> index 9efd618..17faaa7 100644
>>> --- a/src/collection/umscollection/CMakeLists.txt
>>> +++ b/src/collection/umscollection/CMakeLists.txt
>>> @@ -29,7 +29,7 @@ set(amarok_collection-umscollection_PART_SRCS
>>>   support/UmsDeviceInfo.cpp
>>>   support/UmsConnectionAssistant.cpp)
>>>
>>> -kde4_add_plugin(amarok_collection-umscollection WITH_PREFIX ${amarok_collection-umscollection_PART_SRCS})
>>> +kde4_add_plugin(amarok_collection-umscollection ${amarok_collection-umscollection_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_collection-umscollection
>>>   amaroklib
>>> diff --git a/src/collection/upnp/CMakeLists.txt b/src/collection/upnp/CMakeLists.txt
>>> index 1ccfe5f..93d81e5 100644
>>> --- a/src/collection/upnp/CMakeLists.txt
>>> +++ b/src/collection/upnp/CMakeLists.txt
>>> @@ -15,7 +15,7 @@ set(amarok_collection-upnpcollection_PART_SRCS
>>>    upnpcollection.cpp)
>>>
>>>
>>> -kde4_add_plugin(amarok_collection-upnpcollection WITH_PREFIX ${amarok_collection-upnpcollection_PART_SRCS})
>>> +kde4_add_plugin(amarok_collection-upnpcollection ${amarok_collection-upnpcollection_PART_SRCS})
>>>
>>>  target_link_libraries(amarok_collection-upnpcollection amaroklib ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDNSSD_LIBS})
>>>
>>>
>>>
>>>
>>
> _______________________________________________
> Amarok-devel mailing list
> Amarok-devel at kde.org
> https://mail.kde.org/mailman/listinfo/amarok-devel
>



-- 
Protect your freedom and join the Fellowship of FSFE:
http://www.fsfe.org
Please don't send me proprietary file formats,
use ISO standard ODF instead (ISO/IEC 26300)

More information about the Amarok-devel mailing list