From 5a5ccc47a2b730a2fa702cd2912c7a62048d1f60 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Tue, 10 Jan 2023 13:46:50 +0200 Subject: [PATCH] Fix clang build other hosts (#1146) IB-7539, #1110 Signed-off-by: Raul Metsma Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 4 ++-- CMakeLists.txt | 5 +++-- RELEASE-NOTES.md | 12 ++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cb359a9e..315d77847 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,7 +225,7 @@ jobs: with: submodules: recursive - name: Install dependencies - run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev + run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev - name: Download artifact uses: dawidd6/action-download-artifact@v2 with: @@ -269,7 +269,7 @@ jobs: with: submodules: recursive - name: Install dependencies - run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev + run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev - name: Download artifact uses: dawidd6/action-download-artifact@v2 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index f314a5502..486394341 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) endif() -project(qdigidoc4 VERSION 4.2.14) +project(qdigidoc4 VERSION 4.3.0) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -22,7 +22,8 @@ set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list include in binary" ) set_env( MOBILEID_URL "https://dd-mid.ria.ee/mid-api" CACHE STRING "URL for Mobile-ID" ) set_env( SMARTID_URL "https://dd-sid.ria.ee/v1" CACHE STRING "URL for Smart-ID" ) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES) -if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO) +if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-object_path_lto,lto.o") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-object_path_lto,lto.o") endif() diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 70a8312c4..fb3cbce3b 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,15 @@ +DigiDoc4 version [4.2.14](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.14) release notes +-------------------------------------- +- Code, Text and translation improvements and updates + +[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.13...v4.2.14) + +DigiDoc4 version [4.2.13](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.13) release notes +-------------------------------------- +- Code, Text and translation improvements and updates + +[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.12...v4.2.13) + DigiDoc4 version [4.2.12](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.12) release notes -------------------------------------- - Code, Text and translation improvements and updates