[Marble-devel] [marble] /: install declarative and components plugins to ${QT_IMPORTS_DIR}

[Niko Sams]

Hi,
anyone else having this issue?

Niko

On Wed, Sep 7, 2011 at 21:10, Niko Sams <niko.sams at gmail.com> wrote:
> I'm using
> CMAKE_INSTALL_PREFIX=/home/niko/kde
> and this now wants to install in  /usr/imports/org/kde/edu/marble
>
> how is it supposed to be?
> do I need to update something to get this fixed?
>
> Niko
>
> On Tue, Sep 6, 2011 at 12:50, Bernhard Beschow <bbeschow at cs.tu-berlin.de> wrote:
>> Git commit 90baa97a7b83b8abcdad26eee57388f62c6f3116 by Bernhard Beschow.
>> Committed on 06/09/2011 at 00:49.
>> Pushed by beschow into branch 'master'.
>>
>> install declarative and components plugins to ${QT_IMPORTS_DIR}
>>
>> Installing the plugins to ${QT_IMPORT_DIR} rather than ${MARBLE_PLUGIN_INSTALL_PATH} avoids having to adjust QML_IMPORT_PATH prior to executing marble-touch.
>>
>> REVIEW: 102536
>> CCBUG: 281379
>>
>> M  +1    -1    MarbleMacros.cmake
>> M  +1    -1    src/plugins/declarative/CMakeLists.txt
>> M  +18   -18   src/plugins/qt-components/CMakeLists.txt
>>
>> http://commits.kde.org/marble/90baa97a7b83b8abcdad26eee57388f62c6f3116
>>
>> diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake
>> index a8a61bd..40aea42 100644
>> --- a/MarbleMacros.cmake
>> +++ b/MarbleMacros.cmake
>> @@ -98,7 +98,7 @@ target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
>>                                            ${QT_QTMAIN_LIBRARY}
>>                                            ${${_target_name}_LIBS}
>>                                            marblewidget )
>> -install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/org/kde/edu/marble/${_install_path} )
>> +install( TARGETS ${_target_name} DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/${_install_path} )
>>
>>  set_target_properties( ${_target_name} PROPERTIES
>>                        INSTALL_RPATH_USE_LINK_PATH TRUE
>> diff --git a/src/plugins/declarative/CMakeLists.txt b/src/plugins/declarative/CMakeLists.txt
>> index f50f479..a52a9d2 100644
>> --- a/src/plugins/declarative/CMakeLists.txt
>> +++ b/src/plugins/declarative/CMakeLists.txt
>> @@ -29,6 +29,6 @@ RelatedActivities.cpp
>>  marble_add_declarative_plugin( MarbleDeclarativePlugin . ${marbleplugin_SRCS})
>>  qt4_automoc(${marbleplugin_SRCS})
>>  target_link_libraries( MarbleDeclarativePlugin ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTWEBKIT_LIBRARY} )
>> -INSTALL( FILES qmldir MarbleSettings.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble )
>> +INSTALL( FILES qmldir MarbleSettings.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble )
>>
>>  endif( QT_QTDECLARATIVE_FOUND )
>> diff --git a/src/plugins/qt-components/CMakeLists.txt b/src/plugins/qt-components/CMakeLists.txt
>> index df233ba..e5811cf 100644
>> --- a/src/plugins/qt-components/CMakeLists.txt
>> +++ b/src/plugins/qt-components/CMakeLists.txt
>> @@ -15,21 +15,21 @@ QT4_ADD_RESOURCES(my_SRCS qtcomponents.qrc)
>>  MARBLE_ADD_DECLARATIVE_PLUGIN( QtComponentsPlugin qtcomponents ${my_SRCS} )
>>  QT4_AUTOMOC(${my_SRCS})
>>  TARGET_LINK_LIBRARIES( QtComponentsPlugin ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTWEBKIT_LIBRARY} )
>> -INSTALL( FILES qmldir DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES MainWidget.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES ConfigurationActivityPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES ConnectionSettingsPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES MapThemeSelectionPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES NavigationSettingsPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES ViewSettingsPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES SearchBar.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES RouteRequestView.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES WaypointView.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES RoutingDialog.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES SearchResultSelectionDialog.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES ActivitySelectionView.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES VirtualGlobeActivityPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES SearchActivityPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES GeocachingActivityPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES GuidanceActivityPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> -INSTALL( FILES WeatherActivityPage.qml DESTINATION ${MARBLE_PLUGIN_PATH}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES MainWidget.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES ConfigurationActivityPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES ConnectionSettingsPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES MapThemeSelectionPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES NavigationSettingsPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES ViewSettingsPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES SearchBar.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES RouteRequestView.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES WaypointView.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES RoutingDialog.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES SearchResultSelectionDialog.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES ActivitySelectionView.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES VirtualGlobeActivityPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES SearchActivityPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES GeocachingActivityPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES GuidanceActivityPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>> +INSTALL( FILES WeatherActivityPage.qml DESTINATION ${QT_IMPORTS_DIR}/org/kde/edu/marble/qtcomponents )
>>
>