Mercurial > hg > orthanc-dicomweb

changeset 668:8e50b0b45233

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged commits inadvertently pushed in 1.17 branch
author Alain Mazy <am@orthanc.team>
date Mon, 26 Aug 2024 12:28:44 +0200
parents 4646d296303e (diff) ae2e3d4c54a2 (current diff)
children 2047b0921877
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Aug 06 09:33:08 2024 +0200
+++ b/CMakeLists.txt	Mon Aug 26 12:28:44 2024 +0200
@@ -23,7 +23,7 @@
 
 project(OrthancDicomWeb)
 
-set(ORTHANC_DICOM_WEB_VERSION "1.17")
+set(ORTHANC_DICOM_WEB_VERSION "mainline")
 
 if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
@@ -101,9 +101,7 @@
   if (ORTHANC_SDK_VERSION STREQUAL "1.12.1")
     include_directories(${CMAKE_SOURCE_DIR}/Resources/Orthanc/Sdk-1.12.1)
   elseif (ORTHANC_SDK_VERSION STREQUAL "framework")
-    set(tmp ${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Include/)
-    message(${tmp})
-    include_directories(${tmp})
+    include_directories(${ORTHANC_FRAMEWORK_ROOT}/../../OrthancServer/Plugins/Include/)
   else()
     message(FATAL_ERROR "Unsupported version of the Orthanc plugin SDK: ${ORTHANC_SDK_VERSION}")
   endif()