# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1545655004 -3600
# Node ID babc1e0eb7f27475661d488adab6df454d2f155d
# Parent  e78d7077ee1c121b2c35bd14d5afe396c55f0075# Parent  714c5d2bee766f2b0bf622f99e9222b9d9d3d425
integration mainline->db-changes

diff -r 714c5d2bee76 -r babc1e0eb7f2 MySQL/CMakeLists.txt
--- a/MySQL/CMakeLists.txt	Mon Dec 24 13:35:26 2018 +0100
+++ b/MySQL/CMakeLists.txt	Mon Dec 24 13:36:44 2018 +0100
@@ -6,6 +6,7 @@
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
+  set(ORTHANC_FRAMEWORK_BRANCH "db-changes")  # TODO - Remove this once out of "db-changes" branch
 else()
   set(ORTHANC_FRAMEWORK_VERSION "1.4.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
diff -r 714c5d2bee76 -r babc1e0eb7f2 PostgreSQL/CMakeLists.txt
--- a/PostgreSQL/CMakeLists.txt	Mon Dec 24 13:35:26 2018 +0100
+++ b/PostgreSQL/CMakeLists.txt	Mon Dec 24 13:36:44 2018 +0100
@@ -6,6 +6,7 @@
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
+  set(ORTHANC_FRAMEWORK_BRANCH "db-changes")  # TODO - Remove this once out of "db-changes" branch
 else()
   set(ORTHANC_FRAMEWORK_VERSION "1.4.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
diff -r 714c5d2bee76 -r babc1e0eb7f2 Resources/CMake/DatabasesPluginConfiguration.cmake
--- a/Resources/CMake/DatabasesPluginConfiguration.cmake	Mon Dec 24 13:35:26 2018 +0100
+++ b/Resources/CMake/DatabasesPluginConfiguration.cmake	Mon Dec 24 13:36:44 2018 +0100
@@ -46,4 +46,9 @@
   ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/IndexBackend.cpp
   ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/StorageBackend.cpp
   ${ORTHANC_ROOT}/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
+
+  # New for "db-changes"
+  #${ORTHANC_ROOT}/OrthancServer/Search/ISqlLookupFormatter.cpp
+  #${ORTHANC_ROOT}/OrthancServer/Search/DatabaseConstraint.cpp
+  #${ORTHANC_ROOT}/OrthancServer/Search/DicomTagConstraint.cpp
   )
diff -r 714c5d2bee76 -r babc1e0eb7f2 SQLite/CMakeLists.txt
--- a/SQLite/CMakeLists.txt	Mon Dec 24 13:35:26 2018 +0100
+++ b/SQLite/CMakeLists.txt	Mon Dec 24 13:36:44 2018 +0100
@@ -6,6 +6,7 @@
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
+  set(ORTHANC_FRAMEWORK_BRANCH "db-changes")  # TODO - Remove this once out of "db-changes" branch
 else()
   set(ORTHANC_FRAMEWORK_VERSION "1.4.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")