# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1523969615 -7200
# Node ID 337a03b31fc4560e8c1dc7f8394d9e8709a6aa2b
# Parent  69472fac235048f4356c7a2288dc099a9f1e29ff
sync

diff -r 69472fac2350 -r 337a03b31fc4 CMakeLists.txt
--- a/CMakeLists.txt	Tue Apr 17 14:04:04 2018 +0200
+++ b/CMakeLists.txt	Tue Apr 17 14:53:35 2018 +0200
@@ -47,6 +47,8 @@
 
 # Download and setup the Orthanc framework
 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/DownloadOrthancFramework.cmake)
+
+set(ORTHANC_FRAMEWORK_PLUGIN ON)
 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake)
 
 set(ENABLE_LOCALE ON)         # Enable support for locales (notably in Boost)
@@ -101,11 +103,6 @@
 endif()
 
 
-add_definitions(
-  -DHAS_ORTHANC_EXCEPTION=1
-  -DORTHANC_SANDBOXED=0
-  )
-
 include_directories(${ORTHANC_ROOT}/Core)  # To access "OrthancException.h"
 
 set(CORE_SOURCES
diff -r 69472fac2350 -r 337a03b31fc4 Resources/Orthanc/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Tue Apr 17 14:04:04 2018 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Tue Apr 17 14:53:35 2018 +0200
@@ -157,18 +157,24 @@
 
   set(ORTHANC_ROOT ${CMAKE_BINARY_DIR}/orthanc)
 
-  if (NOT EXISTS ${ORTHANC_ROOT})
+  if (EXISTS ${ORTHANC_ROOT})
+    message("Updating the Orthanc source repository using Mercurial")
+    execute_process(
+      COMMAND ${ORTHANC_FRAMEWORK_HG} pull
+      WORKING_DIRECTORY ${ORTHANC_ROOT}
+      RESULT_VARIABLE Failure
+      )    
+  else()
     message("Forking the Orthanc source repository using Mercurial")
-
     execute_process(
       COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://bitbucket.org/sjodogne/orthanc"
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
-      )
-    
-    if (Failure OR NOT EXISTS ${ORTHANC_ROOT})
-      message(FATAL_ERROR "Cannot fork the Orthanc repository")
-    endif()
+      )    
+  endif()
+
+  if (Failure OR NOT EXISTS ${ORTHANC_ROOT})
+    message(FATAL_ERROR "Cannot fork the Orthanc repository")
   endif()
 
   message("Setting branch of the Orthanc repository to: ${ORTHANC_FRAMEWORK_BRANCH}")