Skip to content

Commit

Permalink
ix build when using a private RapidJSON library
Browse files Browse the repository at this point in the history
  • Loading branch information
ptahmose authored Sep 26, 2024
1 parent 6b0fbc9 commit 6fb48d5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
VERSION 0.62.4
HOMEPAGE_URL "https://github.com/ZEISS/libczi"
DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI")

Expand Down
3 changes: 1 addition & 2 deletions Src/CZICmd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ else()
FetchContent_Declare(
RapidJSON
GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
GIT_TAG 7c73dd7de7c4f14379b781418c6e947ad464c818 # master as of 2024-08-16
GIT_SHALLOW TRUE
GIT_TAG 815e6e7e7e14be44a6c15d9aefed232ff064cad0 # master as of 2024-09-26
PREFIX "${CMAKE_BINARY_DIR}/vendor/rapidjson"
)

Expand Down
3 changes: 2 additions & 1 deletion Src/libCZI/Doc/version-history.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ version history {#version_history}
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 | [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
0.62.3 | [116](https://github.com/ZEISS/libczi/pull/116) | enable long paths on Windows for CZIcmd, add Windows-ARM64 build
0.62.4 | [117](https://github.com/ZEISS/libczi/pull/117) | fix build with private RapidJSON library

0 comments on commit 6fb48d5

Please sign in to comment.