diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b2ac7bd3..4ee2838d 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -34,6 +34,7 @@ jobs: vcpkg install azure-storage-blobs-cpp:x64-windows-static vcpkg install azure-identity-cpp:x64-windows-static vcpkg install rapidjson 'curl[ssl]' --triplet x64-windows-static + # for the ARM64 cross-compilation build, we also need to install the ARM64 versions of the dependencies vcpkg install azure-storage-blobs-cpp:arm64-windows-static vcpkg install azure-identity-cpp:arm64-windows-static vcpkg install rapidjson 'curl[ssl]' --triplet arm64-windows-static @@ -61,7 +62,8 @@ jobs: run: | # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - # Note that we need to point CMake to the vcpkg-toolchain-file + # Note that we need to point CMake to the vcpkg-toolchain-file, and also specify the target triplet, c.f. https://learn.microsoft.com/en-us/vcpkg/concepts/triplets + # since we aim for a static build. cmake -B "${{github.workspace}}/build" -A x64 -DCMAKE_BUILD_TYPE=${{matrix.build}} -DLIBCZI_BUILD_CZICMD=ON -DLIBCZI_BUILD_CURL_BASED_STREAM=ON -DLIBCZI_BUILD_AZURESDK_BASED_STREAM=ON -DLIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL=ON -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static - name: Configure CMake (Windows ARM64) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a505067..9ed88a77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15) cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html) project(libCZI - VERSION 0.62.2 + VERSION 0.62.3 HOMEPAGE_URL "https://github.com/ZEISS/libczi" DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI") diff --git a/Src/libCZI/Doc/version-history.markdown b/Src/libCZI/Doc/version-history.markdown index 9f2943eb..8dccdb00 100644 --- a/Src/libCZI/Doc/version-history.markdown +++ b/Src/libCZI/Doc/version-history.markdown @@ -28,4 +28,5 @@ version history {#version_history} 0.61.2 | [111](https://github.com/ZEISS/libczi/pull/111) | update libcurl to 8.9.1 (for build with `LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL=OFF`), enable SChannel (on Windows) by default 0.62.0 | [112](https://github.com/ZEISS/libczi/pull/112) | add Azure-SDK based reader for reading from Azure Blob Storage, raise requirement to C++14 for building libCZI (previously C++11 was sufficient) because Azure-SDK requires C++14 0.62.1 | [114](https://github.com/ZEISS/libczi/pull/114) | improve build system fixing issues with msys2 and mingw-w64, cosmetic changes - 0.62.2 | [116](https://github.com/ZEISS/libczi/pull/116) | enable long paths on Windows for CZIcmd, add Windows-ARM64 build \ No newline at end of file + 0.62.2 | [115](https://github.com/ZEISS/libczi/pull/115) | enabling building with clang on windows + 0.62.3 | [116](https://github.com/ZEISS/libczi/pull/116) | enable long paths on Windows for CZIcmd, add Windows-ARM64 build \ No newline at end of file diff --git a/cmake/ExternalEIGEN3.cmake b/cmake/ExternalEIGEN3.cmake index eeaed988..c6cf8bc9 100644 --- a/cmake/ExternalEIGEN3.cmake +++ b/cmake/ExternalEIGEN3.cmake @@ -16,6 +16,7 @@ ExternalProject_Add( "-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}" "-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}" UPDATE_COMMAND "" + CONFIGURE_COMMAND "" # w/o this the build step fails with clang on windows BUILD_COMMAND "" INSTALL_COMMAND "" LOG_DOWNLOAD ON # redirect output to log-file (so that we have less clutter)