# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1729259058 -7200
# Node ID f011fc199b6aacacb0cbe08352019388c4a022a4
# Parent  e32ccca4d772ba7a184ad41045a7237e6f7f1031# Parent  db391f32b91ce9ce78b4d991e2b64ac7dffd4a99
back to mainline

diff -r e32ccca4d772 -r f011fc199b6a NEWS
--- a/NEWS	Fri Oct 18 15:01:09 2024 +0200
+++ b/NEWS	Fri Oct 18 15:44:18 2024 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.1 (2024-10-18)
+========================
+
 * Support of sparse encoding of tiles in OpenSlide (notably for MIRAX format)
 * OrthancWSIDicomizer supports plain TIFF, besides hierarchical TIFF
 * New option: "--force-openslide" to force the use of OpenSlide on TIFF-like files
diff -r e32ccca4d772 -r f011fc199b6a Resources/CMake/Version.cmake
--- a/Resources/CMake/Version.cmake	Fri Oct 18 15:01:09 2024 +0200
+++ b/Resources/CMake/Version.cmake	Fri Oct 18 15:44:18 2024 +0200
@@ -25,13 +25,8 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.1")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
-
-  # This definition is needed if Orthanc Framework <= 1.12.1
-  function(DefineSourceBasenameForTarget targetname)
-  endfunction()
-
 endif()
 
 add_definitions(