[vidalia-svn] r3583: Move the Marble plugins to plugins/marble/. (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-23 23:56:35 -0500 (Mon, 23 Feb 2009)
New Revision: 3583

Modified:
   vidalia/trunk/src/vidalia/CMakeLists.txt
   vidalia/trunk/src/vidalia/vidalia.cpp
Log:

Move the Marble plugins to plugins/marble/.


Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2009-02-24 04:55:38 UTC (rev 3582)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2009-02-24 04:56:35 UTC (rev 3583)
@@ -18,7 +18,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/help/browser
   ${MARBLE_INCLUDE_DIR}
 )
-if (APPLE)
+if (APPLE OR WIN32)
 ##
 ## XXX: The Marble build system on OS X currently doesn't actually install the
 ## required include files to /usr/local/include or similar. Instead, we have
@@ -33,7 +33,7 @@
     ${MARBLE_INCLUDE_DIR}/geodata/scene
     ${MARBLE_INCLUDE_DIR}/Projections
   )
-endif(APPLE)
+endif(APPLE OR WIN32)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/res/vidalia_win.rc.in
@@ -403,13 +403,13 @@
       if (MARBLE_PLUGINS)
         add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
           COMMAND ${CMAKE_COMMAND}
-            ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/plugins
+            ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/plugins/marble
         )
         foreach(it ${MARBLE_PLUGINS})
           add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
             COMMAND ${CMAKE_COMMAND}
               ARGS -E copy_if_different ${it} 
-                    ${CMAKE_CURRENT_BINARY_DIR}/plugins/
+                    ${CMAKE_CURRENT_BINARY_DIR}/plugins/marble/
           )
         endforeach(it)
       endif(MARBLE_PLUGINS)

Modified: vidalia/trunk/src/vidalia/vidalia.cpp
===================================================================
--- vidalia/trunk/src/vidalia/vidalia.cpp	2009-02-24 04:55:38 UTC (rev 3582)
+++ vidalia/trunk/src/vidalia/vidalia.cpp	2009-02-24 04:56:35 UTC (rev 3583)
@@ -126,7 +126,12 @@
 #ifdef USE_MARBLE
   /* Tell Marble where to stash its generated data */
   Marble::MarbleDirs::setMarbleDataPath(dataDirectory());
+
+#ifdef Q_OS_WIN32
+  Marble::MarbleDirs::setMarblePluginPath(vApp->applicationDirPath() 
+                                            + "/plugins/marble");
 #endif
+#endif
 }
 
 /** Destructor */