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

List:       kde-commits
Subject:    [marble] /: Revert "Reuse MARBLE_PLUGIN_INSTALL_PATH."
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2013-11-17 10:51:13
Message-ID: E1Vhzwf-0002tZ-DZ () scm ! kde ! org
[Download RAW message or body]

Git commit 77546c4a76f67671332985a3949bf6a24106333f by Dennis Nienhüser.
Committed on 17/11/2013 at 10:44.
Pushed by nienhueser into branch 'master'.

Revert "Reuse MARBLE_PLUGIN_INSTALL_PATH."

Note that this will break a cmake install when using a local
install path and QTONLY=TRUE, so needs a better approach in
the future. Workarounds are using sudo/root for make install
or disabling designer plugins (WITH_DESIGNER_PLUGIN=FALSE)

This reverts commit 2773f06af5f57563d5c5c8e0ea8e74d56c8300bb.

CCBUG: 327690

M  +2    -2    MarbleMacros.cmake

http://commits.kde.org/marble/77546c4a76f67671332985a3949bf6a24106333f

diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake
index 649736f..b86481f 100644
--- a/MarbleMacros.cmake
+++ b/MarbleMacros.cmake
@@ -112,7 +112,7 @@ if( QTONLY )
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
                                            marblewidget )
-    install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/designer )
+    install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer )
 else( QTONLY )
     kde4_add_plugin( ${_target_name} ${_src} )
     target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
@@ -127,7 +127,7 @@ else( QTONLY )
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
                                            marblewidget )
-    install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/plugins/designer )
+    install( TARGETS ${_target_name} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
 endif( QTONLY )
 
 set_target_properties( ${_target_name} PROPERTIES 
[prev in list] [next in list] [prev in thread] [next in thread]