Commit 3cc2b95c authored by Johnny Jazeix's avatar Johnny Jazeix Committed by Torsten Rahn
Browse files

Revert changes on Windows data and plugins path

parent 0e05ad0a
......@@ -187,7 +187,7 @@ endif()
# Detect default for the user configurable MARBLE_DATA_PATH option
if(WIN32)
set(data_dir ../data)
set(data_dir data)
set(locale_dir "${data_dir}/locale")
set(plugin_dir plugins)
elseif(APPLE)
......
......@@ -61,8 +61,13 @@ install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer )
endmacro( marble_add_designer_plugin _target_name )
set( DATA_PATH ${MARBLE_DATA_PATH} )
set( PLUGIN_PATH ${MARBLE_PLUGIN_PATH} )
if( WIN32 )
set( DATA_PATH ${CMAKE_INSTALL_PREFIX}/${MARBLE_DATA_PATH} )
set( PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${MARBLE_PLUGIN_PATH} )
else( WIN32 )
set( DATA_PATH ${MARBLE_DATA_PATH} )
set( PLUGIN_PATH ${MARBLE_PLUGIN_PATH} )
endif( WIN32 )
macro( marble_add_test TEST_NAME )
if( BUILD_MARBLE_TESTS )
......
......@@ -47,9 +47,15 @@ if(STATIC_BUILD AND WIN32)
target_link_libraries(marble-qt ${QT_PLUGINS_DIR}/imageformats/qsvg.lib)
endif()
if (NOT APPLE)
if(WIN32)
install (TARGETS marble-qt RUNTIME DESTINATION .)
else(WIN32)
if (APPLE)
# No need for this when installing to a bundle
else (APPLE)
install (TARGETS marble-qt RUNTIME DESTINATION bin )
endif (NOT APPLE)
endif (APPLE)
endif(WIN32)
if(APPS_INSTALL_DIR)
install(PROGRAMS org.kde.marble-qt.desktop DESTINATION ${APPS_INSTALL_DIR})
......
......@@ -103,8 +103,9 @@ int main(int argc, char *argv[])
// plugins. In mac be sure to look in the
// application bundle...
#ifdef Q_OS_WIN
QApplication::addLibraryPath( QApplication::applicationDirPath() );
#ifdef Q_WS_WIN
QApplication::addLibraryPath( QApplication::applicationDirPath()
+ QDir::separator() + QLatin1String("plugins"));
#endif
#ifdef Q_OS_MACX
QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus);
......
......@@ -50,7 +50,7 @@ target_include_directories(astro
# choose the correct target install library path
if(WIN32)
INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION bin ARCHIVE DESTINATION lib)
INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION . ARCHIVE DESTINATION lib)
elseif(APPLE)
INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
else()
......
......@@ -448,7 +448,7 @@ target_include_directories(marblewidget
# choose the correct target install library path
if(WIN32)
install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION bin ARCHIVE DESTINATION lib)
install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION . ARCHIVE DESTINATION lib)
elseif(APPLE)
install(TARGETS marblewidget LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
else()
......
......@@ -136,7 +136,7 @@ QString MarbleDirs::systemPath()
#ifdef Q_OS_WIN
return QCoreApplication::applicationDirPath() + QDir::separator() + ".." + QDir::separator() + QLatin1String("data");
return QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("data");
#endif
#ifdef Q_OS_MACX
......@@ -216,7 +216,7 @@ QString MarbleDirs::pluginSystemPath()
#endif // mac bundle
#ifdef Q_OS_WIN
return QCoreApplication::applicationDirPath();
return QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("plugins");
#endif
#ifdef Q_OS_ANDROID
......
......@@ -53,7 +53,7 @@ if(Qt5Positioning_FOUND)
endif()
if(WIN32)
install(TARGETS marbledeclarative RUNTIME DESTINATION bin ARCHIVE DESTINATION lib)
install(TARGETS marbledeclarative RUNTIME DESTINATION . ARCHIVE DESTINATION lib)
else()
install(TARGETS marbledeclarative LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment