# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1607963531 -3600
# Node ID e01322c6109444a9fd48b66c8cd3a0163f01ab5f
# Parent  5e604adfd41fa8e2de750782e4d643d77d6773ce# Parent  3f4fa9ca637b4c12511cbe762c35a3921c5c1b70
integration PostgreSQL-3.3 -> mainline

diff -r 3f4fa9ca637b -r e01322c61094 MySQL/CMakeLists.txt
--- a/MySQL/CMakeLists.txt	Mon Dec 14 17:07:13 2020 +0100
+++ b/MySQL/CMakeLists.txt	Mon Dec 14 17:32:11 2020 +0100
@@ -11,7 +11,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_OPTIMAL_VERSION_MAJOR}.${ORTHANC_OPTIMAL_VERSION_MINOR}.${ORTHANC_OPTIMAL_VERSION_REVISION}")
+  set(ORTHANC_FRAMEWORK_VERSION "4a3ba4bf4ba7")  # This is Orthanc Framework pre-1.8.2 (includes a fix for OpenSSL on MSVC)
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 3f4fa9ca637b -r e01322c61094 PostgreSQL/CMakeLists.txt
--- a/PostgreSQL/CMakeLists.txt	Mon Dec 14 17:07:13 2020 +0100
+++ b/PostgreSQL/CMakeLists.txt	Mon Dec 14 17:32:11 2020 +0100
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(OrthancPostgreSQL)
 
-set(ORTHANC_PLUGIN_VERSION "3.3")
+set(ORTHANC_PLUGIN_VERSION "mainline")
 
 set(ORTHANC_OPTIMAL_VERSION_MAJOR    1)
 set(ORTHANC_OPTIMAL_VERSION_MINOR    5)
diff -r 3f4fa9ca637b -r e01322c61094 SQLite/CMakeLists.txt
--- a/SQLite/CMakeLists.txt	Mon Dec 14 17:07:13 2020 +0100
+++ b/SQLite/CMakeLists.txt	Mon Dec 14 17:32:11 2020 +0100
@@ -11,8 +11,8 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.7.2")
-  set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_OPTIMAL_VERSION_MAJOR}.${ORTHANC_OPTIMAL_VERSION_MINOR}.${ORTHANC_OPTIMAL_VERSION_REVISION}")
+  set(ORTHANC_FRAMEWORK_VERSION "1.8.1")
+  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
 include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginParameters.cmake)