# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1724668124 -7200
# Node ID 8e50b0b45233dc1e4e6f1f9728bb97db9bc03220
# Parent  4646d296303ebfbb101305a757c871cf265f70bd# Parent  ae2e3d4c54a254e2c09824c3e38d0b78086a2159
merged commits inadvertently pushed in 1.17 branch

diff -r ae2e3d4c54a2 -r 8e50b0b45233 CMakeLists.txt
--- 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()