[umbrello/Applications/19.04] /: Reduce difference between build variants
Christoph Feck
cfeck at kde.org
Tue Apr 2 22:58:32 BST 2019
On 03/31/19 15:37, Ralf Habacker wrote:
> Git commit 22c74b2db1003e27531293ea85b5ecb9cc2a734c by Ralf Habacker.
> Committed on 31/03/2019 at 13:35.
> Pushed by habacker into branch 'Applications/19.04'.
>
> Reduce difference between build variants
>
> M +4 -0 CMakeLists.txt
> M +3 -11 tools/CMakeLists.txt
> M +13 -17 umbrello/pics/global/CMakeLists.txt
> R +- -- umbrello/pics/global/hi128-apps-umbrello.png [from: umbrello/pics/global/kde4/hi128-apps-umbrello.png - 100% similarity]
> R +- -- umbrello/pics/global/hi16-apps-umbrello.png [from: umbrello/pics/global/kde4/hi16-apps-umbrello.png - 100% similarity]
> R +- -- umbrello/pics/global/hi16-mimetypes-application-x-uml.png [from: umbrello/pics/global/kde4/hi16-mimetypes-application-x-uml.png - 100% similarity]
> R +- -- umbrello/pics/global/hi22-apps-umbrello.png [from: umbrello/pics/global/kde4/hi22-apps-umbrello.png - 100% similarity]
> R +- -- umbrello/pics/global/hi32-apps-umbrello.png [from: umbrello/pics/global/kde4/hi32-apps-umbrello.png - 100% similarity]
> R +- -- umbrello/pics/global/hi32-mimetypes-application-x-uml.png [from: umbrello/pics/global/kde4/hi32-mimetypes-application-x-uml.png - 100% similarity]
> R +- -- umbrello/pics/global/hi48-apps-umbrello.png [from: umbrello/pics/global/kde4/hi48-apps-umbrello.png - 100% similarity]
> R +- -- umbrello/pics/global/hi64-apps-umbrello.png [from: umbrello/pics/global/kde4/hi64-apps-umbrello.png - 100% similarity]
> R +- -- umbrello/pics/global/hisc-apps-umbrello.svgz [from: umbrello/pics/global/kde4/hisc-apps-umbrello.svgz - 100% similarity]
> D +0 -3 umbrello/pics/global/kde4/CMakeLists.txt
>
> https://commits.kde.org/umbrello/22c74b2db1003e27531293ea85b5ecb9cc2a734c
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index c6d59779e..db4c0f035 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -33,6 +33,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
> endif()
>
> if(NOT BUILD_KF5)
> + set(APP_SUFFIX)
> + set(LIB_PREFIX Qt4::Qt)
A
> set(CMAKE_AUTOMOC ON)
> set(CMAKE_INCLUDE_CURRENT_DIR ON)
> include(ECMKDE4Macros)
> @@ -41,6 +43,8 @@ if(NOT BUILD_KF5)
> set(KDEV_SOURCE_DIR lib/kdev4-php)
> set(KDEV_COMPONENTS)
> else()
> + set(UMBRELLO_APP_SUFFIX 5)
> + set(UMBRELLO_LIB_PREFIX Qt5::)
B
A vs B seems not to match.
I believe that is the cause for the CI build failure.
https://build.kde.org/job/Applications/view/Everything%20-%20stable-kf5-qt5/job/umbrello/job/stable-kf5-qt5%20SUSEQt5.10/
Please fix the Applications/19.04 branch immediately.
The release team creates tarballs after April 4th.
> # we need some parts of the ECM CMake helpers
> find_package(ECM 1.1.0 REQUIRED NO_MODULE)
> list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
> diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
> index d2c616ecb..ef480758c 100644
> --- a/tools/CMakeLists.txt
> +++ b/tools/CMakeLists.txt
> @@ -1,17 +1,11 @@
>
> -if(NOT BUILD_KF5)
> - set(LIBS Qt4::QtXml Qt4::QtCore)
> -else()
> - set(LIBS Qt5::Xml Qt5::Core)
> -endif()
> +set(LIBS ${LIB_PREFIX}Xml ${LIB_PREFIX}Core)
>
> set(po2xmi_SRCS po2xmi.cpp shared.cpp)
>
> add_executable(po2xmi ${po2xmi_SRCS})
> target_link_libraries(po2xmi ${LIBS})
> -if(BUILD_KF5)
> - set_target_properties(po2xmi PROPERTIES OUTPUT_NAME po2xmi5)
> -endif()
> +set_target_properties(po2xmi PROPERTIES OUTPUT_NAME po2xmi${APP_SUFFIX})
>
> install(TARGETS po2xmi ${INSTALL_TARGETS_DEFAULT_ARGS})
>
> @@ -20,9 +14,7 @@ set(xmi2pot_SRCS xmi2pot.cpp shared.cpp)
>
> add_executable(xmi2pot ${xmi2pot_SRCS})
> target_link_libraries(xmi2pot ${LIBS})
> -if(BUILD_KF5)
> - set_target_properties(xmi2pot PROPERTIES OUTPUT_NAME xmi2pot5)
> -endif()
> +set_target_properties(xmi2pot PROPERTIES OUTPUT_NAME xmi2pot${APP_SUFFIX})
>
> install(TARGETS xmi2pot ${INSTALL_TARGETS_DEFAULT_ARGS})
>
> diff --git a/umbrello/pics/global/CMakeLists.txt b/umbrello/pics/global/CMakeLists.txt
> index c6fa41db5..b45d8ebea 100644
> --- a/umbrello/pics/global/CMakeLists.txt
> +++ b/umbrello/pics/global/CMakeLists.txt
> @@ -1,17 +1,13 @@
> -if(NOT BUILD_KF5)
> - add_subdirectory(kde4)
> -else()
> - ecm_install_icons(
> - ICONS 16-apps-umbrello.png
> - 16-mimetypes-application-x-uml.png
> - 22-apps-umbrello.png
> - 32-apps-umbrello.png
> - 32-mimetypes-application-x-uml.png
> - 48-apps-umbrello.png
> - 64-apps-umbrello.png
> - 128-apps-umbrello.png
> - sc-apps-umbrello.svgz
> - THEME hicolor
> - DESTINATION ${ICON_INSTALL_DIR}
> - )
> -endif()
> +ecm_install_icons(
> + ICONS 16-apps-umbrello.png
> + 16-mimetypes-application-x-uml.png
> + 22-apps-umbrello.png
> + 32-apps-umbrello.png
> + 32-mimetypes-application-x-uml.png
> + 48-apps-umbrello.png
> + 64-apps-umbrello.png
> + 128-apps-umbrello.png
> + sc-apps-umbrello.svgz
> + THEME hicolor
> + DESTINATION ${ICON_INSTALL_DIR}
> +)
> diff --git a/umbrello/pics/global/kde4/hi128-apps-umbrello.png b/umbrello/pics/global/hi128-apps-umbrello.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi128-apps-umbrello.png
> rename to umbrello/pics/global/hi128-apps-umbrello.png
> diff --git a/umbrello/pics/global/kde4/hi16-apps-umbrello.png b/umbrello/pics/global/hi16-apps-umbrello.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi16-apps-umbrello.png
> rename to umbrello/pics/global/hi16-apps-umbrello.png
> diff --git a/umbrello/pics/global/kde4/hi16-mimetypes-application-x-uml.png b/umbrello/pics/global/hi16-mimetypes-application-x-uml.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi16-mimetypes-application-x-uml.png
> rename to umbrello/pics/global/hi16-mimetypes-application-x-uml.png
> diff --git a/umbrello/pics/global/kde4/hi22-apps-umbrello.png b/umbrello/pics/global/hi22-apps-umbrello.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi22-apps-umbrello.png
> rename to umbrello/pics/global/hi22-apps-umbrello.png
> diff --git a/umbrello/pics/global/kde4/hi32-apps-umbrello.png b/umbrello/pics/global/hi32-apps-umbrello.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi32-apps-umbrello.png
> rename to umbrello/pics/global/hi32-apps-umbrello.png
> diff --git a/umbrello/pics/global/kde4/hi32-mimetypes-application-x-uml.png b/umbrello/pics/global/hi32-mimetypes-application-x-uml.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi32-mimetypes-application-x-uml.png
> rename to umbrello/pics/global/hi32-mimetypes-application-x-uml.png
> diff --git a/umbrello/pics/global/kde4/hi48-apps-umbrello.png b/umbrello/pics/global/hi48-apps-umbrello.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi48-apps-umbrello.png
> rename to umbrello/pics/global/hi48-apps-umbrello.png
> diff --git a/umbrello/pics/global/kde4/hi64-apps-umbrello.png b/umbrello/pics/global/hi64-apps-umbrello.png
> similarity index 100%
> rename from umbrello/pics/global/kde4/hi64-apps-umbrello.png
> rename to umbrello/pics/global/hi64-apps-umbrello.png
> diff --git a/umbrello/pics/global/kde4/hisc-apps-umbrello.svgz b/umbrello/pics/global/hisc-apps-umbrello.svgz
> similarity index 100%
> rename from umbrello/pics/global/kde4/hisc-apps-umbrello.svgz
> rename to umbrello/pics/global/hisc-apps-umbrello.svgz
> diff --git a/umbrello/pics/global/kde4/CMakeLists.txt b/umbrello/pics/global/kde4/CMakeLists.txt
> deleted file mode 100644
> index 83c413321..000000000
> --- a/umbrello/pics/global/kde4/CMakeLists.txt
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -if(NOT BUILD_KF5)
> - kde4_install_icons(${ICON_INSTALL_DIR})
> -endif()
>
--
Christoph Feck
KDE Release Team
More information about the umbrello-devel
mailing list