Mercurial > hg > orthanc-databases
changeset 182:e01322c61094
integration PostgreSQL-3.3 -> mainline
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 14 Dec 2020 17:32:11 +0100 |
| parents | 5e604adfd41f (diff) 3f4fa9ca637b (current diff) |
| children | 2f94b2046d7c |
| files | MySQL/CMakeLists.txt PostgreSQL/CMakeLists.txt |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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)
--- 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)