From f2493e2e1ff10e72dfed5de82b1abcbbb1cf7772 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Tue, 26 Sep 2023 14:40:08 +0300 Subject: [PATCH] Increase version number and update OpenSSL (#1219) IB-7723, IB-7835 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 2 +- prepare_osx_build_environment.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d4cb15a..9f60159b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,7 @@ jobs: uses: lukka/run-vcpkg@v7 with: vcpkgArguments: openssl zlib flatbuffers - vcpkgGitCommitId: 9b9c2758ece1d8ac0de90589730bb5ccf45c0874 + vcpkgGitCommitId: 6a349fe1fbea1e5fcda2e0775f555d829a5e82df vcpkgTriplet: x64-windows - name: Install Qt uses: jurplel/install-qt-action@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index f8f32715..0b753500 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(qdigidoc4 VERSION 4.4.0) +project(qdigidoc4 VERSION 4.5.0) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index 2b00177c..0838dd71 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -5,7 +5,7 @@ set -e ######### Versions of libraries/frameworks to be compiled QT_VER="6.5.2" -OPENSSL_VER="3.0.10" +OPENSSL_VER="3.0.11" OPENLDAP_VER="2.6.6" REBUILD=false BUILD_PATH=~/cmake_builds