# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1604682415 -3600
# Node ID 3abebab5d00447c461b5535cbe54184a26adf76e
# Parent  a0af5a8182a80eacbebf64c8f0c7618b4abeb006
sync

diff -r a0af5a8182a8 -r 3abebab5d004 CMakeLists.txt
--- a/CMakeLists.txt	Tue Aug 04 14:26:01 2020 +0200
+++ b/CMakeLists.txt	Fri Nov 06 18:06:55 2020 +0100
@@ -20,7 +20,7 @@
 
 set(ORTHANC_PLUGIN_VERSION "mainline")
 
-if (ORTHANC_PLUGIN_VERSION STREQUAL "mainlinea")
+if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
diff -r a0af5a8182a8 -r 3abebab5d004 Framework/HttpQueries/DetectTransferPlugin.cpp
--- a/Framework/HttpQueries/DetectTransferPlugin.cpp	Tue Aug 04 14:26:01 2020 +0200
+++ b/Framework/HttpQueries/DetectTransferPlugin.cpp	Fri Nov 06 18:06:55 2020 +0100
@@ -22,6 +22,7 @@
 #include "../TransferToolbox.h"
 #include "HttpQueriesRunner.h"
 
+#include <Logging.h>
 #include <OrthancException.h>
 
 #include <json/reader.h>
diff -r a0af5a8182a8 -r 3abebab5d004 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Aug 04 14:26:01 2020 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Nov 06 18:06:55 2020 +0100
@@ -112,6 +112,12 @@
         set(ORTHANC_FRAMEWORK_MD5 "3c171217f930abe80246997bdbcaf7cc")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.2")
         set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3")
+        set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
+        set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
+        set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r a0af5a8182a8 -r 3abebab5d004 Resources/Orthanc/LinuxStandardBaseToolchain.cmake
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Tue Aug 04 14:26:01 2020 +0200
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Fri Nov 06 18:06:55 2020 +0100
@@ -21,11 +21,11 @@
 #
 # Full build, as used on the BuildBot CIS:
 #
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
 #
 # Or, more lightweight version (without libp11 and ICU):
 #
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
 #
 
 INCLUDE(CMakeForceCompiler)
diff -r a0af5a8182a8 -r 3abebab5d004 Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Tue Aug 04 14:26:01 2020 +0200
+++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Fri Nov 06 18:06:55 2020 +0100
@@ -779,7 +779,7 @@
     void UpdateProgress(float progress);
     
   public:
-    OrthancJob(const std::string& jobType);
+    explicit OrthancJob(const std::string& jobType);
     
     virtual ~OrthancJob()
     {