[kcalutils/Applications/19.04] /: Revert "GIT_SILENT: Prepare 5.11.1"

laurent Montel montel at kde.org
Mon Apr 29 12:06:36 BST 2019


Wierd I don't know what was bad during commit, as changes was done change 
version to 5.11.1 but it send an empty CmakeLists.txt...
Wierd...


Le lundi 29 avril 2019, 11:12:22 CEST Ben Cooksley a écrit :
> Git commit 1f7909e2a2d0ce786ea7eb83363185fd46e47d0c by Ben Cooksley.
> Committed on 29/04/2019 at 09:11.
> Pushed by bcooksley into branch 'Applications/19.04'.
> 
> Revert "GIT_SILENT: Prepare 5.11.1"
> It seems something went very wrong with this commit, because I doubt an
> empty CMakeLists.txt was intended.
> 
> This breakage was detected by the CI system immediately, but has yet to be
> corrected.
> 
> This reverts commit 8cfcd9e6eeb0fda7297f7dca7a6151f993e5c1bf.
> 
> CCMAIL: kde-pim at kde.org
> 
> M  +100  -0    CMakeLists.txt
> 
> https://commits.kde.org/kcalutils/1f7909e2a2d0ce786ea7eb83363185fd46e47d0c
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index e69de29bb..52caf4495 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -0,0 +1,100 @@
> +cmake_minimum_required(VERSION 3.5)
> +
> +set(PIM_VERSION "5.11.1")
> +project(KCalUtils VERSION ${PIM_VERSION})
> +
> +# ECM setup
> +set(KF5_MIN_VERSION "5.56.0")
> +
> +find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +set(CMAKE_MODULE_PATH ${KCalUtils_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
> +
> +include(ECMGenerateHeaders)
> +include(GenerateExportHeader)
> +include(ECMGeneratePriFile)
> +
> +include(ECMSetupVersion)
> +include(FeatureSummary)
> +include(KDEInstallDirs)
> +include(KDECMakeSettings)
> +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
> +include(ECMQtDeclareLoggingCategory)
> +
> +include(KPIMGrantleeMacros)
> +
> +set(CALENDARUTILS_LIB_VERSION ${PIM_VERSION})
> +set(CALENDARCORE_LIB_VERSION "5.11.1")
> +set(IDENTITYMANAGER_LIB_VERSION "5.11.1")
> +ecm_setup_version(PROJECT VARIABLE_PREFIX KCALUTILS
> +                        VERSION_HEADER
> "${CMAKE_CURRENT_BINARY_DIR}/kcalutils_version.h" +                       
> PACKAGE_VERSION_FILE
> "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarUtilsConfigVersion.cmake" +        
>                SOVERSION 5
> +)
> +
> +########### Find packages ###########
> +find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
> +find_package(Grantlee5 "5.1" CONFIG REQUIRED)
> +
> +find_package(KF5CalendarCore ${CALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
> +find_package(KF5IdentityManagement ${IDENTITYMANAGER_LIB_VERSION} CONFIG
> REQUIRED) +
> +add_definitions(-DTRANSLATION_DOMAIN=\"libkcalutils5\")
> +if (${KF5Config_VERSION} STRGREATER "5.56.0")
> +        add_definitions(-DQT_NO_FOREACH)
> +        MESSAGE(STATUS "compile without foreach")
> +endif()
> +
> +# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13
> reevaluate it) +if (${Qt5Widgets_VERSION} STRGREATER "5.13")
> +   MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile
> without deprecated methods. bug QTBUG-74665") +else()
> +   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
> +endif()
> +if(BUILD_TESTING)
> +  add_definitions(-DBUILD_TESTING)
> +endif()
> +
> +########### Targets ###########
> +add_subdirectory(src)
> +
> +if(BUILD_TESTING)
> +  add_subdirectory(autotests)
> +endif()
> +
> +########### CMake Config Files ###########
> +set(CMAKECONFIG_INSTALL_DIR
> "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5CalendarUtils") +
> +configure_package_config_file(
> +  "${CMAKE_CURRENT_SOURCE_DIR}/KF5CalendarUtilsConfig.cmake.in"
> +  "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarUtilsConfig.cmake"
> +  INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
> +)
> +
> +install(FILES
> +  "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarUtilsConfig.cmake"
> +  "${CMAKE_CURRENT_BINARY_DIR}/KF5CalendarUtilsConfigVersion.cmake"
> +  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
> +  COMPONENT Devel
> +)
> +
> +install(EXPORT KF5CalendarUtilsTargets
> +  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
> +  FILE KF5CalendarUtilsTargets.cmake
> +  NAMESPACE KF5::
> +)
> +
> +install(FILES
> +  ${CMAKE_CURRENT_BINARY_DIR}/kcalutils_version.h
> +  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}
> +  COMPONENT Devel
> +)
> +
> +install( FILES kcalutils.renamecategories kcalutils.categories DESTINATION
> ${KDE_INSTALL_CONFDIR} ) +
> +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)


-- 
Laurent Montel | laurent.montel at kdab.com | KDE/Qt Senior Software Engineer 
KDAB (France) S.A.S., a KDAB Group company Tel. France +33 (0)4 90 84 08 53, 
 www.kdab.fr KDAB - The Qt, C++ and OpenGL Experts - Platform-independent 
software solutions 





More information about the kde-pim mailing list