[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kholidays] /: Adjust meta data and build system to being part of KF5
From:       laurent Montel <montel () kde ! org>
Date:       2018-01-20 13:14:22
Message-ID: 3110704.tAvCxdczYv () linux-5nvn
[Download RAW message or body]

Hi,
I think that kf5 module use specific variable (used by script)
see:

cmake_minimum_required(VERSION 3.0)
  
set(KF5_VERSION "5.43.0") # handled by release scripts
set(KF5_DEP_VERSION "5.42.0") # handled by release scripts
project(KDeclarative VERSION ${KF5_VERSION})


We need to adapt it as it.

Regards.

Le samedi 20 janvier 2018, 11:26:38 CET Volker Krause a écrit :
> Git commit f5f6355e7cde107d742eb79734accb4955de692c by Volker Krause.
> Committed on 20/01/2018 at 10:24.
> Pushed by vkrause into branch 'master'.
> 
> Adjust meta data and build system to being part of KF5
> 
> M  +4    -7    CMakeLists.txt
> M  +3    -4    metainfo.yaml
> 
> https://commits.kde.org/kholidays/f5f6355e7cde107d742eb79734accb4955de692c
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index a3c896a..8fb911c 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -1,12 +1,9 @@
>  cmake_minimum_required(VERSION 3.0)
> -set(PIM_VERSION "5.7.41")
> 
> -project(KHolidays VERSION ${PIM_VERSION})
> +set(KF5_VERSION "5.42.0")
> +project(KHolidays VERSION ${KF5_VERSION})
> 
> -# ECM setup
> -set(KF5_VERSION "5.41.0")
> -
> -find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
> +find_package(ECM 5.42.0 REQUIRED NO_MODULE)
>  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
> 
>  include(GenerateExportHeader)
> @@ -21,7 +18,7 @@ include(KDECMakeSettings)
>  include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
>  include(ECMCoverageOption)
> 
> -set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION})
> +set(KHOLIDAYS_LIB_VERSION ${KF5_VERSION})
> 
>  ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS
>                          VERSION_HEADER
> "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" diff --git
> a/metainfo.yaml b/metainfo.yaml



[prev in list] [next in list] [prev in thread] [next in thread]