Rex Dieter wrote:
> Alexander Neundorf wrote:
>
>> On Friday 04 February 2011, Rex Dieter wrote:
>>> Alexander Neundorf wrote:
>>> >> 2. copy-n-paste the aforementioned code all over (similiar to what's
>>> >> already in FindKDEInternal)
>>> >>
>>> >>
>>> >> 3. wait for cmake to handle this better natively
>>> >
>>> > I think it's option 3.
>>>
>>> How about compromise 2+3 ? :)
>>
>> How do you mean that ?
>> For now, I think we'll have to go with 2.
>> But this shouldn't be necessary for any package which uses KDE, i.e.
>> which does a
>> find_package(KDE4)
>> right ?
>
> Another edge-case, digikam (which does do find_package(KDE4)), for which
> we carry the following patch, is it's use of rpath properties really
> needed here, or is there a better solution?
Arg, wrong patch, this one should make more sense.
-- Rex
diff -up digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt.rpath digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
diff -up digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake.rpath digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake
--- digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake.rpath 2010-08-22 03:53:08.000000000 -0500
+++ digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake 2010-08-25 14:22:27.973423652 -0500
@@ -38,8 +38,7 @@ endif( QTONLY )
set_target_properties( ${_target_name} PROPERTIES
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
- BUILD_WITH_INSTALL_RPATH TRUE
- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_SUFFIX} )
+ BUILD_WITH_INSTALL_RPATH TRUE )
endmacro( marble_add_plugin _target_name )
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
