# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1700832301 -3600
# Node ID 06da140e11b8689ac8c548c890e1b05a3aa3caab
# Parent  e77efde44233074fa313d7578a27e17a3389306e# Parent  020716fe2ac8942a80fa4d2d6789fafb1e280502
back to mainline

diff -r e77efde44233 -r 06da140e11b8 CMakeLists.txt
--- a/CMakeLists.txt	Fri Nov 24 12:55:50 2023 +0100
+++ b/CMakeLists.txt	Fri Nov 24 14:25:01 2023 +0100
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.0")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
@@ -196,7 +196,9 @@
   VERSION ${ORTHANC_OHIF_VERSION} 
   SOVERSION ${ORTHANC_OHIF_VERSION})
 
-DefineSourceBasenameForTarget(OrthancOHIF)
+if (DEFINED DefineSourceBasenameForTarget)
+  DefineSourceBasenameForTarget(OrthancOHIF)
+endif()
 
 install(
   TARGETS OrthancOHIF
diff -r e77efde44233 -r 06da140e11b8 NEWS
--- a/NEWS	Fri Nov 24 12:55:50 2023 +0100
+++ b/NEWS	Fri Nov 24 14:25:01 2023 +0100
@@ -1,9 +1,13 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.1 (2023-11-24)
+========================
+
 * Updated OHIF to 3.7.0
-* The default configuration has been adapted to avoid unneccesary transcoding 
-  on Orthanc side.
+* The default configuration has been adapted to avoid unneccesary
+  transcoding on Orthanc side
 * Patch to make the build of static assets reproducible, following a
   suggestion by Bernhard M. Wiedemann (bwiedemann@suse.de)