Mercurial > hg > orthanc
changeset 6439:8b2ef7afec93
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 18 Nov 2025 17:21:29 +0100 |
| parents | 9aa0a92c7d27 (current diff) b832b6f7375d (diff) |
| children | bd0fb2559a7e f0287aed9e5c |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/Compiler.cmake Tue Nov 18 17:21:09 2025 +0100 +++ b/OrthancFramework/Resources/CMake/Compiler.cmake Tue Nov 18 17:21:29 2025 +0100 @@ -247,7 +247,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-enum-constexpr-conversion") # it seems that some recent MacOS compilers don't set these flags correctly which prevents zlib from building correctly - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64") add_definitions( -D_XOPEN_SOURCE=1
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake Tue Nov 18 17:21:09 2025 +0100 +++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake Tue Nov 18 17:21:29 2025 +0100 @@ -215,10 +215,10 @@ # Advanced storage 0.2.2 (framework pre-1.12.10) set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "bd5ba2cec329010b912209345acbdeaf") - elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4e7b2af98475") - # Worklists plugin 1.0.0 (framework pre-1.12.10) + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "0ebe8cfd9bf7") + # Worklists plugin 0.9.0 (framework pre-1.12.10) set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) - set(ORTHANC_FRAMEWORK_MD5 "d80cf200b16ff194c464d5a21d56055d") + set(ORTHANC_FRAMEWORK_MD5 "17a5ca9254e881ab89c93d052d4655cb") endif() endif() endif()