diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a39fa6a1..23d83ce03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: "zlib:x64-windows-v${{ matrix.toolset }}" "boost-test:x86-windows-v${{ matrix.toolset }}" "boost-test:x64-windows-v${{ matrix.toolset }}" - vcpkgGitCommitId: d417ae59d6e9aa20d9f812b5deb966645c54687d + vcpkgGitCommitId: 772d435ba18bf2f342458e0187ab7b48b84fe3f0 - name: Install dependencies run: choco install doxygen.install swig -y > $null - name: Build xsd diff --git a/CMakeLists.txt b/CMakeLists.txt index 09ae7198b..21ede20e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(libdigidocpp VERSION 3.14.7) +project(libdigidocpp VERSION 3.14.8) if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) endif() diff --git a/etc/Doxyfile.in b/etc/Doxyfile.in index 307cd4815..1c9ae41df 100644 --- a/etc/Doxyfile.in +++ b/etc/Doxyfile.in @@ -51,7 +51,7 @@ PROJECT_BRIEF = # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = @CMAKE_SOURCE_DIR@/cmake/modules/ID.ico +PROJECT_LOGO = @CMAKE_MODULE_PATH@/ID.ico # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index 6f4fc2729..a3796f324 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -5,7 +5,7 @@ XERCES_DIR=xerces-c-3.2.3 XALAN_DIR=xalan_c-1.12 XMLSEC_DIR=xml-security-c-2.0.2 XSD=xsd-4.0.0-i686-macosx -OPENSSL_DIR=openssl-1.1.1k +OPENSSL_DIR=openssl-1.1.1l LIBXML2_DIR=libxml2-2.9.10 ANDROID_NDK=android-ndk-r21e FREETYPE_DIR=freetype-2.10.1