# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1594032044 -7200
# Node ID 710537acb488fef8ed2b118e80b8df19e4a0eebb
# Parent  23cf7def8e44919a39bf5003e36672e3facefa5c
dynamic linking against the system-wide Orthanc framework library

diff -r 23cf7def8e44 -r 710537acb488 MySQL/NEWS
--- a/MySQL/NEWS	Mon Jul 06 12:04:00 2020 +0200
+++ b/MySQL/NEWS	Mon Jul 06 12:40:44 2020 +0200
@@ -7,6 +7,7 @@
 * Added an advisory lock to avoid race conditions during database setup
 * Added "MaximumConnectionRetries" & "ConnectionRetryInterval" to configure 
   the retries when connecting to the DB at startup
+* Support of dynamic linking against the system-wide Orthanc framework library
 
 
 Release 2.0 (2019-01-23)
diff -r 23cf7def8e44 -r 710537acb488 PostgreSQL/NEWS
--- a/PostgreSQL/NEWS	Mon Jul 06 12:04:00 2020 +0200
+++ b/PostgreSQL/NEWS	Mon Jul 06 12:40:44 2020 +0200
@@ -4,6 +4,7 @@
 * Added an advisory lock to avoid race conditions during database setup
 * Added "MaximumConnectionRetries" & "ConnectionRetryInterval" to configure 
   the retries when connecting to the DB at startup
+* Support of dynamic linking against the system-wide Orthanc framework library
 
 
 Release 3.2 (2019-03-01)
diff -r 23cf7def8e44 -r 710537acb488 Resources/CMake/DatabasesFrameworkConfiguration.cmake
--- a/Resources/CMake/DatabasesFrameworkConfiguration.cmake	Mon Jul 06 12:04:00 2020 +0200
+++ b/Resources/CMake/DatabasesFrameworkConfiguration.cmake	Mon Jul 06 12:40:44 2020 +0200
@@ -53,14 +53,29 @@
 ## Configure the Orthanc Framework
 #####################################################################
 
-# Those modules of the Orthanc framework are not needed when dealing
-# with databases
-set(ENABLE_MODULE_IMAGES OFF)
-set(ENABLE_MODULE_JOBS OFF)
-set(ENABLE_MODULE_DICOM OFF)
+if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
+  link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES})
 
-include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
-include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources)
+  if (ENABLE_SQLITE_BACKEND)
+    add_definitions(-DORTHANC_ENABLE_SQLITE=1)
+  endif()
+  
+  set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
+  set(USE_GOOGLE_TEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
+  mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_PACKAGE)
+  include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/GoogleTestConfiguration.cmake)
+  
+else()
+  # Those modules of the Orthanc framework are not needed when dealing
+  # with databases
+  set(ENABLE_MODULE_IMAGES OFF)
+  set(ENABLE_MODULE_JOBS OFF)
+  set(ENABLE_MODULE_DICOM OFF)
+  
+  include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
+  include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources)
+endif()
+
 
 
 #####################################################################
diff -r 23cf7def8e44 -r 710537acb488 Resources/CMake/DatabasesFrameworkParameters.cmake
--- a/Resources/CMake/DatabasesFrameworkParameters.cmake	Mon Jul 06 12:04:00 2020 +0200
+++ b/Resources/CMake/DatabasesFrameworkParameters.cmake	Mon Jul 06 12:40:44 2020 +0200
@@ -23,7 +23,10 @@
 #####################################################################
 
 include(${CMAKE_CURRENT_LIST_DIR}/../Orthanc/CMake/DownloadOrthancFramework.cmake)
-include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake)
+
+if (NOT ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
+  include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake)
+endif()
 
 
 #####################################################################
diff -r 23cf7def8e44 -r 710537acb488 Resources/CMake/DatabasesPluginConfiguration.cmake
--- a/Resources/CMake/DatabasesPluginConfiguration.cmake	Mon Jul 06 12:04:00 2020 +0200
+++ b/Resources/CMake/DatabasesPluginConfiguration.cmake	Mon Jul 06 12:40:44 2020 +0200
@@ -23,8 +23,6 @@
 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/Plugins/OrthancPluginsExports.cmake)
 
 
-include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources)
-
 if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK)
   if (ORTHANC_SDK_VERSION STREQUAL "0.9.5")
     include_directories(${ORTHANC_DATABASES_ROOT}/Resources/Orthanc/Sdk-0.9.5)