Commit 0d1832c4 authored by Ralf Habacker's avatar Ralf Habacker
Browse files

Fix 'Umbrello/KF5 installed files conflicts with Umbrello/KDE4'.

BUG:373930
FIXED-IN: 2.21.80 (KDE Applications 17.03.80)
parent a0b2781d
......@@ -125,6 +125,7 @@ if(NOT BUILD_KF5)
macro_display_feature_log()
KDE4_NO_ENABLE_FINAL(umbrello)
set(UMBRELLO_DATA_INSTALL_DIR ${DATA_INSTALL_DIR}/umbrello)
else()
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
......@@ -176,6 +177,7 @@ else()
endmacro(ecm_add_executable)
set(BUILD_UNITTESTS 1)
set(UMBRELLO_DATA_INSTALL_DIR ${DATA_INSTALL_DIR}/umbrello5)
endif()
......
......@@ -9,6 +9,9 @@ set(po2xmi_SRCS po2xmi.cpp shared.cpp)
ecm_add_executable(po2xmi ${po2xmi_SRCS})
target_link_libraries(po2xmi ${LIBS})
if(BUILD_KF5)
set_target_properties(po2xmi PROPERTIES OUTPUT_NAME po2xmi5)
endif()
install(TARGETS po2xmi ${INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -17,6 +20,9 @@ set(xmi2pot_SRCS xmi2pot.cpp shared.cpp)
ecm_add_executable(xmi2pot ${xmi2pot_SRCS})
target_link_libraries(xmi2pot ${LIBS})
if(BUILD_KF5)
set_target_properties(xmi2pot PROPERTIES OUTPUT_NAME xmi2pot5)
endif()
install(TARGETS xmi2pot ${INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -581,6 +581,7 @@ else()
)
add_executable(umbrello ${umbrello_SRCS})
target_link_libraries(umbrello libumbrello KF5::WindowSystem)
set_target_properties(umbrello PROPERTIES OUTPUT_NAME umbrello5)
endif()
if(LIB_BUILD_MODE EQUAL SHARED)
install(TARGETS libumbrello ${INSTALL_TARGETS_DEFAULT_ARGS} )
......@@ -593,13 +594,13 @@ if(NOT BUILD_KF5)
install( PROGRAMS umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/umbrelloui.rc
DESTINATION ${DATA_INSTALL_DIR}/umbrello )
DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} )
else()
file(READ umbrello.desktop UMBRELLO_DESKTOP)
string(REPLACE "-caption" "-qwindowtitle" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP}")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop "${UMBRELLO_DESKTOP_OUT}")
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello.desktop)
install(FILES org.kde.umbrello.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello5.desktop)
install(FILES org.kde.umbrello5.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
endif()
install( FILES
......@@ -607,11 +608,11 @@ install( FILES
docgenerators/docbook2xhtml.xsl
docgenerators/xmi.css
docgenerators/common.ent
DESTINATION ${DATA_INSTALL_DIR}/umbrello )
DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} )
install( DIRECTORY
layouts
DESTINATION ${DATA_INSTALL_DIR}/umbrello
DESTINATION ${UMBRELLO_DATA_INSTALL_DIR}
PATTERN .svn EXCLUDE )
add_subdirectory( pics )
......@@ -483,7 +483,7 @@ void CodeGenerationPolicy::setDefaults(bool emitUpdateSignal)
if (path.isEmpty()) {
#if QT_VERSION >= 0x050000
path = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QLatin1String("umbrello/headings"),
QLatin1String("umbrello5/headings"),
QStandardPaths::LocateDirectory).first();
#else
KStandardDirs stddirs;
......
install( FILES heading.adb heading.ads heading.as heading.cpp heading.cs heading.d heading.h heading.idl heading.java heading.js heading.php heading.pm heading.py heading.rb heading.sql heading.xsd DESTINATION ${DATA_INSTALL_DIR}/umbrello/headings )
install( FILES heading.adb heading.ads heading.as heading.cpp heading.cs heading.d heading.h heading.idl heading.java heading.js heading.php heading.pm heading.py heading.rb heading.sql heading.xsd DESTINATION ${UMBRELLO_DATA_INSTALL_DIR}/headings )
......@@ -294,7 +294,7 @@ bool LayoutGenerator::availableConfigFiles(UMLScene *scene, QHash<QString,QStrin
{
QString diagramType = Uml::DiagramType::toString(scene->type()).toLower();
#if QT_VERSION >= 0x050000
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("umbrello/layouts"), QStandardPaths::LocateDirectory);
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("umbrello5/layouts"), QStandardPaths::LocateDirectory);
QStringList fileNames;
foreach(const QString& dir, dirs) {
const QStringList entries = QDir(dir).entryList(QStringList() << QString::fromLatin1("%1*.desktop").arg(diagramType));
......
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