Mercurial > hg > orthanc-education
changeset 88:485e749cc2f0
added CMake option "ORTHANC_SDK_VERSION"
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 30 Jul 2026 13:43:30 +0200 |
| parents | e566ebeae426 |
| children | ef6377c0a926 |
| files | CMakeLists.txt NEWS |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu Jul 30 13:21:46 2026 +0200 +++ b/CMakeLists.txt Thu Jul 30 13:43:30 2026 +0200 @@ -47,6 +47,8 @@ # Advanced parameters to fine-tune linking against system libraries set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK") +set(ORTHANC_SDK_VERSION "1.12.9" CACHE STRING "Version of the Orthanc plugin SDK to use, if not using the system version (can be \"framework\" or \"1.12.9\")") + set(ORTHANC_FRAMEWORK_STATIC OFF CACHE BOOL "If linking against the Orthanc framework system library, indicates whether this library was statically linked") mark_as_advanced(ORTHANC_FRAMEWORK_STATIC) @@ -114,10 +116,12 @@ # Check that the Orthanc SDK headers are available if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK) - if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "path") - include_directories(${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Include) + if (ORTHANC_SDK_VERSION STREQUAL "1.12.9") + include_directories(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/Sdk-1.12.9) + elseif (ORTHANC_SDK_VERSION STREQUAL "framework") + include_directories(${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Include/) else() - include_directories(${CMAKE_SOURCE_DIR}/Resources/Orthanc/Sdk-1.12.9) + message(FATAL_ERROR "Unsupported version of the Orthanc plugin SDK: ${ORTHANC_SDK_VERSION}") endif() else () CHECK_INCLUDE_FILE_CXX(orthanc/OrthancCPlugin.h HAVE_ORTHANC_H)
--- a/NEWS Thu Jul 30 13:21:46 2026 +0200 +++ b/NEWS Thu Jul 30 13:43:30 2026 +0200 @@ -9,6 +9,7 @@ during LTI configuration. * REST API: Job ID is reported when starting the DICOM-ization, and upload ID is part of the DICOM-ization status +* Added CMake option "ORTHANC_SDK_VERSION" Version 1.1 (2025-11-07)