# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1666868027 -7200
# Node ID 899f303613fb44545bbff1c29d12e99f131bb21c
# Parent  fcb2ed6c88ff4e2a0ab0fac1519da9a73b799682# Parent  3b1ae7a81d9b25136e21bced48410b7ebeb5c2df
merge from 1.11.2 branch

diff -r fcb2ed6c88ff -r 899f303613fb OrthancFramework/Sources/Enumerations.h
--- a/OrthancFramework/Sources/Enumerations.h	Wed Oct 19 21:15:41 2022 +0200
+++ b/OrthancFramework/Sources/Enumerations.h	Thu Oct 27 12:53:47 2022 +0200
@@ -906,7 +906,7 @@
   ORTHANC_PUBLIC
   const char* GetResourceTypeText(ResourceType type,
                                   bool isPlural,
-                                  bool isLowerCase);
+                                  bool isUpperCase);
 
   ORTHANC_PUBLIC
   void GetAllDicomTransferSyntaxes(std::set<DicomTransferSyntax>& target);
diff -r fcb2ed6c88ff -r 899f303613fb OrthancServer/CMakeLists.txt
--- a/OrthancServer/CMakeLists.txt	Wed Oct 19 21:15:41 2022 +0200
+++ b/OrthancServer/CMakeLists.txt	Thu Oct 27 12:53:47 2022 +0200
@@ -591,6 +591,8 @@
     -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
     -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
     -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+
+    INSTALL_COMMAND ""
     )
 
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -607,8 +609,8 @@
     list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
     list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix)
     install(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}
-      ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
+      ${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build/${Prefix}ConnectivityChecks${Suffix}
+      ${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
       DESTINATION "share/orthanc/plugins")
   endif()
 endif()
@@ -662,6 +664,8 @@
     -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
     -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
     -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+
+    INSTALL_COMMAND ""
     )
 
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -678,8 +682,8 @@
     list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
     list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix)
     install(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}DelayedDeletion${Suffix}
-      ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}DelayedDeletion${Suffix}.${ORTHANC_VERSION}
+      ${CMAKE_CURRENT_BINARY_DIR}/DelayedDeletion-build/${Prefix}DelayedDeletion${Suffix}
+      ${CMAKE_CURRENT_BINARY_DIR}/DelayedDeletion-build/${Prefix}DelayedDeletion${Suffix}.${ORTHANC_VERSION}
       DESTINATION "share/orthanc/plugins")
   endif()
 endif()
diff -r fcb2ed6c88ff -r 899f303613fb TODO
--- a/TODO	Wed Oct 19 21:15:41 2022 +0200
+++ b/TODO	Thu Oct 27 12:53:47 2022 +0200
@@ -83,8 +83,6 @@
 Short-term
 ----------
 
-* Add "KeepSource" to "/modify" and "/anonymize" routes
-  https://groups.google.com/g/orthanc-users/c/svS3YOqA2Mo/m/wcoE18IcAAAJ
 
 --------
 Mid-term