changeset 289:c47774d28496

cleanup
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 14 Aug 2025 16:33:45 +0200
parents 67c833e5dee6
children 553cb41bf490
files CMakeLists.txt CodeAnalysis/GenerateOrthancSDK.py Resources/SyncOrthancFolder.py
diffstat 3 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Aug 13 12:02:04 2025 +0200
+++ b/CMakeLists.txt	Thu Aug 14 16:33:45 2025 +0200
@@ -65,9 +65,6 @@
 set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"")
 set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"")
 
-# Advanced parameters to fine-tune linking against system libraries
-set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system-wide version of the Orthanc plugin SDK")
-
 # Generate the documentation about the "ORTHANC_SDK_VERSION" option
 set(tmp "Version of the Orthanc plugin SDK to use, if not using the system version (can be")
 foreach(version IN LISTS ORTHANC_SDK_AVAILABLE_VERSIONS)
@@ -75,6 +72,7 @@
 endforeach()
 set(tmp "${tmp} \"framework\", or \"path\")")
 
+set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system-wide version of the Orthanc plugin SDK")
 set(ORTHANC_SDK_VERSION "${ORTHANC_SDK_DEFAULT_VERSION}" CACHE STRING "${tmp}")
 set(ORTHANC_SDK_PATH "" CACHE STRING "Path to the orthanc/OrthancCPlugin.h file, if ORTHANC_SDK_VERSION is set to \"path\"")
 
--- a/CodeAnalysis/GenerateOrthancSDK.py	Wed Aug 13 12:02:04 2025 +0200
+++ b/CodeAnalysis/GenerateOrthancSDK.py	Thu Aug 14 16:33:45 2025 +0200
@@ -116,6 +116,7 @@
                 key = item.get('key')
                 if key != None:
                     name = '%s_%s' % (key_prefix, key)
+            assert(name != None)
             print('Primitive unavailable in SDK: %s (only available since %s)' % (name, '.'.join(map(str, since_sdk))))
 
         return available
--- a/Resources/SyncOrthancFolder.py	Wed Aug 13 12:02:04 2025 +0200
+++ b/Resources/SyncOrthancFolder.py	Thu Aug 14 16:33:45 2025 +0200
@@ -31,9 +31,6 @@
 
 import multiprocessing
 import os
-import re
-import stat
-import subprocess
 import urllib.request
 
 TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc')