# HG changeset patch # User Sebastien Jodogne # Date 1786686378 -7200 # Node ID c82f58d4e1e42196aec3e86060b8c156665d43f6 # Parent 514fc4880d6af785dd05e4c8f9ec17e1877fc940 NULL-terminating ORTHANC_PATCHES for Microsoft Visual Studio diff -r 514fc4880d6a -r c82f58d4e1e4 OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake --- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Thu Aug 13 17:42:47 2026 +0200 +++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Fri Aug 14 07:46:18 2026 +0200 @@ -744,20 +744,13 @@ list(LENGTH ORTHANC_PATCHES_LIST ORTHANC_PATCHES_COUNT) -if (ORTHANC_PATCHES_COUNT GREATER 0) - set(ORTHANC_PATCHES_C_BODY "") +set(ORTHANC_PATCHES_C_BODY "") - foreach(PATCH IN LISTS ORTHANC_PATCHES_LIST) - if (ORTHANC_PATCHES_C_BODY) - string(APPEND ORTHANC_PATCHES_C_BODY "\",\n \"") - endif() - string(APPEND ORTHANC_PATCHES_C_BODY "${PATCH}") - endforeach() +foreach(PATCH IN LISTS ORTHANC_PATCHES_LIST) + string(APPEND ORTHANC_PATCHES_C_BODY " \"${PATCH}\",\n") +endforeach() - set(ORTHANC_PATCHES_C_BODY "\"${ORTHANC_PATCHES_C_BODY}\"") -else() - set(ORTHANC_PATCHES_C_BODY "") -endif() +string(APPEND ORTHANC_PATCHES_C_BODY " NULL") configure_file( ${CMAKE_CURRENT_LIST_DIR}/PatchList.h.in diff -r 514fc4880d6a -r c82f58d4e1e4 OrthancFramework/Resources/CMake/PatchList.cpp.in --- a/OrthancFramework/Resources/CMake/PatchList.cpp.in Thu Aug 13 17:42:47 2026 +0200 +++ b/OrthancFramework/Resources/CMake/PatchList.cpp.in Fri Aug 14 07:46:18 2026 +0200 @@ -24,9 +24,11 @@ #include "PatchList.h" -const char *const ORTHANC_PATCHES[] = +#include + +const char *const ORTHANC_PATCHES[@ORTHANC_PATCHES_COUNT@ + 1] = { - @ORTHANC_PATCHES_C_BODY@ +@ORTHANC_PATCHES_C_BODY@ }; const unsigned int ORTHANC_PATCHES_COUNT = @ORTHANC_PATCHES_COUNT@;