# HG changeset patch # User Sebastien Jodogne # Date 1593616418 -7200 # Node ID 99d13f5b576a443f2688d1ec6375a9728a757231 # Parent b0f20acf5793e96bac93b423c84c040a771d4436 removed option "framework" for ORTHANC_SDK_VERSION diff -r b0f20acf5793 -r 99d13f5b576a Resources/CMake/DatabasesPluginConfiguration.cmake --- a/Resources/CMake/DatabasesPluginConfiguration.cmake Wed Jul 01 08:54:43 2020 +0200 +++ b/Resources/CMake/DatabasesPluginConfiguration.cmake Wed Jul 01 17:13:38 2020 +0200 @@ -33,8 +33,6 @@ include_directories(${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Sdk-1.5.2) elseif (ORTHANC_SDK_VERSION STREQUAL "1.5.4") include_directories(${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Sdk-1.5.4) - elseif (ORTHANC_SDK_VERSION STREQUAL "framework") - include_directories(${ORTHANC_FRAMEWORK_ROOT}/Plugins/Include) else() message(FATAL_ERROR "Unsupported version of the Orthanc plugin SDK: ${ORTHANC_SDK_VERSION}") endif() diff -r b0f20acf5793 -r 99d13f5b576a Resources/CMake/DatabasesPluginParameters.cmake --- a/Resources/CMake/DatabasesPluginParameters.cmake Wed Jul 01 08:54:43 2020 +0200 +++ b/Resources/CMake/DatabasesPluginParameters.cmake Wed Jul 01 17:13:38 2020 +0200 @@ -25,7 +25,7 @@ # 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.5.4" CACHE STRING "Version of the Orthanc plugin SDK to use, if not using the system version (can be \"0.9.5\", \"1.4.0\", \"1.5.2\", \"1.5.4\" or \"framework\")") +set(ORTHANC_SDK_VERSION "1.5.4" CACHE STRING "Version of the Orthanc plugin SDK to use, if not using the system version (can be \"0.9.5\", \"1.4.0\", \"1.5.2\", or \"1.5.4\")") include(${CMAKE_CURRENT_LIST_DIR}/DatabasesFrameworkParameters.cmake)