Mercurial > hg > orthanc-databases
changeset 68:babc1e0eb7f2 db-changes
integration mainline->db-changes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 24 Dec 2018 13:36:44 +0100 |
parents | e78d7077ee1c (diff) 714c5d2bee76 (current diff) |
children | 19764fc60ade |
files | Resources/CMake/DatabasesPluginConfiguration.cmake |
diffstat | 4 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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")
--- 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")
--- 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 )
--- 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")