# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1591862726 -7200
# Node ID 47e9e788224c2ab20d89d3e0570e838c92cf5695
# Parent  64919a9958bb4686bac8e1bb24fabaf9b6f57df0
removing occurrences of ORTHANC_ROOT

diff -r 64919a9958bb -r 47e9e788224c CMakeLists.txt
--- a/CMakeLists.txt	Thu Jun 11 09:18:30 2020 +0200
+++ b/CMakeLists.txt	Thu Jun 11 10:05:26 2020 +0200
@@ -170,10 +170,10 @@
     ${ORTHANC_SERVER_SOURCES}
     ${ORTHANC_FRAMEWORK_UNIT_TESTS}
     ${ORTHANC_SERVER_UNIT_TESTS}
-    ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
-    ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
-    ${ORTHANC_ROOT}/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp
-    ${ORTHANC_ROOT}/OrthancServer/Sources/main.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Sources/main.cpp
     )
 
   set_source_files_properties(${ORTHANC_ALL_SOURCES}
@@ -226,7 +226,7 @@
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
   execute_process(
     COMMAND 
-    ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py
+    ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
     ${ORTHANC_VERSION} Orthanc Orthanc.exe "Lightweight, RESTful DICOM server for medical imaging"
     ERROR_VARIABLE Failure
     OUTPUT_FILE ${AUTOGENERATED_DIR}/Orthanc.rc
@@ -398,7 +398,7 @@
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     execute_process(
       COMMAND 
-      ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py
+      ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
       ${ORTHANC_VERSION} ServeFolders ServeFolders.dll "Orthanc plugin to serve additional folders"
       ERROR_VARIABLE Failure
       OUTPUT_FILE ${AUTOGENERATED_DIR}/ServeFolders.rc
@@ -412,7 +412,7 @@
   endif()  
 
   add_library(ServeFolders SHARED 
-    ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
     ${SERVE_FOLDERS_RESOURCES}
     )
 
@@ -441,7 +441,7 @@
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     execute_process(
       COMMAND 
-      ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py
+      ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
       ${ORTHANC_VERSION} ModalityWorklists ModalityWorklists.dll "Sample Orthanc plugin to serve modality worklists"
       ERROR_VARIABLE Failure
       OUTPUT_FILE ${AUTOGENERATED_DIR}/ModalityWorklists.rc
@@ -455,7 +455,7 @@
   endif()
 
   add_library(ModalityWorklists SHARED 
-    ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
     ${MODALITY_WORKLISTS_RESOURCES}
     )
 
@@ -499,7 +499,7 @@
   endif()
 
   externalproject_add(ConnectivityChecks
-    SOURCE_DIR "${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ConnectivityChecks"
+    SOURCE_DIR "${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ConnectivityChecks"
 
     # We explicitly provide a build directory, in order to avoid paths
     # that are too long on our Visual Studio 2008 CIS
@@ -543,13 +543,13 @@
 
 if (BUILD_RECOVER_COMPRESSED_FILE)
   set(RECOVER_COMPRESSED_SOURCES
-    ${ORTHANC_ROOT}/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp
+    ${CMAKE_SOURCE_DIR}/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp
     )
 
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     execute_process(
       COMMAND 
-      ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py
+      ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
       ${ORTHANC_VERSION} OrthancRecoverCompressedFile OrthancRecoverCompressedFile.exe
       "Lightweight, RESTful DICOM server for medical imaging"
       ERROR_VARIABLE Failure
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/CMake/Compiler.cmake
--- a/OrthancFramework/Resources/CMake/Compiler.cmake	Thu Jun 11 09:18:30 2020 +0200
+++ b/OrthancFramework/Resources/CMake/Compiler.cmake	Thu Jun 11 10:05:26 2020 +0200
@@ -75,7 +75,7 @@
     # compatibility header.
     # http://stackoverflow.com/a/70630/881731
     # https://en.wikibooks.org/wiki/C_Programming/C_Reference/stdint.h#External_links
-    include_directories(${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/VisualStudio)
+    include_directories(${CMAKE_CURRENT_LIST_DIR}/../../Resources/ThirdParty/VisualStudio)
   endif()
 
   link_libraries(netapi32)
@@ -109,7 +109,7 @@
 
   if (NOT DEFINED ENABLE_PLUGINS_VERSION_SCRIPT OR 
       ENABLE_PLUGINS_VERSION_SCRIPT)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${ORTHANC_ROOT}/OrthancFramework/Resources/VersionScriptPlugins.map")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/../VersionScriptPlugins.map")
   endif()
 
   # Remove the "-rdynamic" option
@@ -197,7 +197,7 @@
   endif()
 
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -exported_symbols_list ${ORTHANC_ROOT}/Plugins/Samples/Common/ExportedSymbols.list")
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../ExportedSymbolsPlugins.list")
 
   add_definitions(
     -D_XOPEN_SOURCE=1
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake	Thu Jun 11 09:18:30 2020 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake	Thu Jun 11 10:05:26 2020 +0200
@@ -126,59 +126,59 @@
 #####################################################################
 
 set(ORTHANC_CORE_SOURCES_INTERNAL
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/MemoryCache.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/MemoryObjectCache.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/MemoryStringCache.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/ChunkedBuffer.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomTag.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/EnumerationDictionary.h
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/Enumerations.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/FileStorage/MemoryStorageArea.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/MultipartStreamReader.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/StringMatcher.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/Logging.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/OrthancFramework.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/SerializationToolbox.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/Toolbox.cpp
-  ${ORTHANC_ROOT}/OrthancFramework/Sources/WebServiceParameters.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/MemoryCache.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/MemoryObjectCache.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/MemoryStringCache.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/ChunkedBuffer.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomTag.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/EnumerationDictionary.h
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Enumerations.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/FileStorage/MemoryStorageArea.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/MultipartStreamReader.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/StringMatcher.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Logging.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/OrthancFramework.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SerializationToolbox.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Toolbox.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/WebServiceParameters.cpp
   )
 
 if (ENABLE_MODULE_IMAGES)
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/Font.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/FontRegistry.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/IImageWriter.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/Image.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/ImageAccessor.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/ImageBuffer.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/ImageProcessing.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PamReader.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PamWriter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/Font.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/FontRegistry.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/IImageWriter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/Image.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/ImageAccessor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/ImageBuffer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/ImageProcessing.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/PamReader.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/PamWriter.cpp
     )
 endif()
 
 if (ENABLE_MODULE_DICOM)
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomArray.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomInstanceHasher.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomMap.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomValue.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomArray.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomImageInformation.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomInstanceHasher.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomIntegerPixelAccessor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomMap.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomValue.cpp
     )
 endif()
 
 if (ENABLE_MODULE_JOBS)
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/GenericJobUnserializer.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobInfo.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobStatus.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobStepResult.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/GenericJobUnserializer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/JobInfo.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/JobStatus.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/JobStepResult.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/Operations/JobOperationValues.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/Operations/LogJobOperation.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/SetOfCommandsJob.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/SetOfInstancesJob.cpp
     )
 endif()
 
@@ -198,12 +198,12 @@
   add_definitions(-DORTHANC_ENABLE_SQLITE=1)
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/Connection.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/FunctionContext.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/Statement.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/StatementId.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/StatementReference.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/Transaction.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SQLite/Connection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SQLite/FunctionContext.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SQLite/Statement.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SQLite/StatementId.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SQLite/StatementReference.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SQLite/Transaction.cpp
     )
 endif()
 
@@ -229,7 +229,7 @@
 
       add_definitions(-DORTHANC_ENABLE_PKCS11=1)
       list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-        ${ORTHANC_ROOT}/OrthancFramework/Sources/Pkcs11.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Pkcs11.cpp
         )
     else()
       message(FATAL_ERROR "OpenSSL is required to enable PKCS#11 support")
@@ -249,7 +249,7 @@
   add_definitions(-DORTHANC_ENABLE_CURL=1)
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpClient.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpClient.cpp
     )
 endif()
 
@@ -271,22 +271,22 @@
   endif()
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/BufferHttpSender.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/FilesystemHttpHandler.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/FilesystemHttpSender.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpContentNegociation.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpFileSender.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpOutput.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpServer.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpStreamTranscoder.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpToolbox.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/StringHttpOutput.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApi.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiCall.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiGetCall.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiHierarchy.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiOutput.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiPath.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/BufferHttpSender.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/FilesystemHttpHandler.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/FilesystemHttpSender.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/HttpContentNegociation.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/HttpFileSender.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/HttpOutput.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/HttpServer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/HttpStreamTranscoder.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/HttpToolbox.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/HttpServer/StringHttpOutput.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/RestApi/RestApi.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/RestApi/RestApiCall.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/RestApi/RestApiGetCall.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/RestApi/RestApiHierarchy.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/RestApi/RestApiOutput.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/RestApi/RestApiPath.cpp
     )
 endif()
 
@@ -317,9 +317,9 @@
   add_definitions(-DORTHANC_ENABLE_JPEG=1)
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/JpegErrorManager.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/JpegReader.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/JpegWriter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/JpegErrorManager.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/JpegReader.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/JpegWriter.cpp
     )
 endif()
 
@@ -333,16 +333,16 @@
   add_definitions(-DORTHANC_ENABLE_ZLIB=1)
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/DeflateBaseCompressor.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/GzipCompressor.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/ZlibCompressor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Compression/DeflateBaseCompressor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Compression/GzipCompressor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Compression/ZlibCompressor.cpp
     )
 
   if (NOT ORTHANC_SANDBOXED)
     list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/HierarchicalZipWriter.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/ZipWriter.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/FileStorage/StorageAccessor.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Compression/HierarchicalZipWriter.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Compression/ZipWriter.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/FileStorage/StorageAccessor.cpp
       )
   endif()
 endif()
@@ -365,8 +365,8 @@
   add_definitions(-DORTHANC_ENABLE_PNG=1)
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PngReader.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PngWriter.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/PngReader.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Images/PngWriter.cpp
     )
 endif()
 
@@ -380,8 +380,8 @@
   add_definitions(-DORTHANC_ENABLE_LUA=1)
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Lua/LuaContext.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Lua/LuaFunctionCall.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Lua/LuaContext.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Lua/LuaFunctionCall.cpp
     )
 endif()
 
@@ -475,39 +475,39 @@
   endif()
 
   set(ORTHANC_DICOM_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DicomModification.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/ParsedDicomDir.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/ParsedDicomFile.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/DicomModification.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/DicomWebJsonVisitor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/FromDcmtkBridge.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/ParsedDicomDir.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/ParsedDicomFile.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/ToDcmtkBridge.cpp
 
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/Internals/DicomFrameIndex.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/Internals/DicomFrameIndex.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/Internals/DicomImageDecoder.cpp
     )
 
   if (NOT ORTHANC_SANDBOXED)
     list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/DicomDirWriter.cpp
       )
   endif()
 
   if (ENABLE_DCMTK_NETWORKING)
     add_definitions(-DORTHANC_ENABLE_DCMTK_NETWORKING=1)
     list(APPEND ORTHANC_DICOM_SOURCES_INTERNAL
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomServer.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/MoveScp.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/StoreScp.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/TimeoutDicomConnectionManager.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/DicomAssociation.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/DicomAssociationParameters.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/DicomControlUserConnection.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/DicomFindAnswers.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/DicomServer.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/DicomStoreUserConnection.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/Internals/CommandDispatcher.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/Internals/FindScp.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/Internals/MoveScp.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/Internals/GetScp.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/Internals/StoreScp.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/RemoteModalityParameters.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomNetworking/TimeoutDicomConnectionManager.cpp
       )
   else()
     add_definitions(-DORTHANC_ENABLE_DCMTK_NETWORKING=0)
@@ -517,9 +517,9 @@
   if (ENABLE_DCMTK_TRANSCODING)
     add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=1)
     list(APPEND ORTHANC_DICOM_SOURCES_INTERNAL
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DcmtkTranscoder.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/IDicomTranscoder.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/MemoryBufferTranscoder.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/DcmtkTranscoder.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/IDicomTranscoder.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomParsing/MemoryBufferTranscoder.cpp
       )
   else()
     add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=0)
@@ -570,22 +570,22 @@
     )
 
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/SharedArchive.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/FileBuffer.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/FileStorage/FilesystemStorage.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/MetricsRegistry.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/MultiThreading/RunnableWorkersPool.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/MultiThreading/Semaphore.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/MultiThreading/SharedMessageQueue.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SharedLibrary.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/SystemToolbox.cpp
-    ${ORTHANC_ROOT}/OrthancFramework/Sources/TemporaryFile.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/SharedArchive.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/FileBuffer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/FileStorage/FilesystemStorage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/MetricsRegistry.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/MultiThreading/RunnableWorkersPool.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/MultiThreading/Semaphore.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/MultiThreading/SharedMessageQueue.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SharedLibrary.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/SystemToolbox.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/TemporaryFile.cpp
     )
 
   if (ENABLE_MODULE_JOBS)
     list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobsEngine.cpp
-      ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/JobsEngine.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/../../Sources/JobsEngine/JobsRegistry.cpp
       )
   endif()
 endif()
@@ -663,15 +663,15 @@
   ${UUID_SOURCES}
   ${ZLIB_SOURCES}
 
-  ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/md5/md5.c
-  ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/base64/base64.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Resources/ThirdParty/md5/md5.c
+  ${CMAKE_CURRENT_LIST_DIR}/../../Resources/ThirdParty/base64/base64.cpp
   )
 
 if (ENABLE_ZLIB AND NOT ORTHANC_SANDBOXED)
   list(APPEND ORTHANC_CORE_SOURCES_DEPENDENCIES
     # This is the minizip distribution to create ZIP files using zlib
-    ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/minizip/ioapi.c
-    ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/minizip/zip.c
+    ${CMAKE_CURRENT_LIST_DIR}/../../Resources/ThirdParty/minizip/ioapi.c
+    ${CMAKE_CURRENT_LIST_DIR}/../../Resources/ThirdParty/minizip/zip.c
     )
 endif()
 
@@ -681,7 +681,7 @@
   EmbedResources(
     --namespace=Orthanc.FrameworkResources
     --target=OrthancFrameworkResources
-    --framework-path=${ORTHANC_ROOT}/OrthancFramework/Sources
+    --framework-path=${CMAKE_CURRENT_LIST_DIR}/../../Sources
     ${LIBICU_RESOURCES}
     ${DCMTK_DICTIONARIES}
     )
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/CMake/WebAssembly/ArithmeticTests/CMakeLists.txt
--- a/OrthancFramework/Resources/CMake/WebAssembly/ArithmeticTests/CMakeLists.txt	Thu Jun 11 09:18:30 2020 +0200
+++ b/OrthancFramework/Resources/CMake/WebAssembly/ArithmeticTests/CMakeLists.txt	Thu Jun 11 10:05:26 2020 +0200
@@ -1,9 +1,9 @@
-# source ~/Downloads/emsdk-portable/emsdk_env.sh
-# cmake .. -DCMAKE_TOOLCHAIN_FILE=${EMSCRIPTEN}/cmake/Modules/Platform/Emscripten.cmake \
-#       -DCMAKE_BUILD_TYPE=Debug \
-#       -DCMAKE_INSTALL_PREFIX=/tmp/wasm-install/
+# source ~/Downloads/emsdk/emsdk_env.sh
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=Debug -DEMSCRIPTEN_SET_LLVM_WASM_BACKEND=ON -DCMAKE_INSTALL_PREFIX=/tmp/wasm-install/
 # make install
-# -> Open the "/tmp/wasm-install/" with Firefox by serving it through Apache
+# cd /tmp/wasm-install
+# python -m SimpleHTTPServer 8000
+# firefox http://localhost:8000/
 # -> Copy the result as "../arith.h"
 
 
@@ -26,9 +26,8 @@
 ## Prepare DCMTK 3.6.2
 #####################################################################
 
-set(ORTHANC_ROOT ${CMAKE_SOURCE_DIR}/../../..)
-include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake)
-include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
+include(${CMAKE_SOURCE_DIR}/../../Compiler.cmake)
+include(${CMAKE_SOURCE_DIR}/../../DownloadPackage.cmake)
 
 set(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.2)
 set(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.2.tar.gz")
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/DcmtkTools/CMakeLists.txt
--- a/OrthancFramework/Resources/DcmtkTools/CMakeLists.txt	Thu Jun 11 09:18:30 2020 +0200
+++ b/OrthancFramework/Resources/DcmtkTools/CMakeLists.txt	Thu Jun 11 10:05:26 2020 +0200
@@ -1,12 +1,11 @@
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../Resources/LinuxStandardBaseToolchain.cmake -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../Resources/Toolchains/LinuxStandardBaseToolchain.cmake -G Ninja
 
 cmake_minimum_required(VERSION 2.8)
 
 project(DcmtkTools)
 
-set(ORTHANC_ROOT ${CMAKE_SOURCE_DIR}/../../)
-include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake)
-include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
+include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/Compiler.cmake)
+include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/DownloadPackage.cmake)
 
 set(STATIC_BUILD ON CACHE BOOL "")
 set(ALLOW_DOWNLOADS ON CACHE BOOL "")
@@ -18,7 +17,7 @@
 set(ENABLE_DCMTK_NETWORKING ON CACHE BOOL "")
 set(ENABLE_DCMTK_TRANSCODING ON CACHE BOOL "")
 
-include(${ORTHANC_ROOT}/Resources/CMake/DcmtkConfiguration.cmake)
+include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/DcmtkConfiguration.cmake)
 
 add_library(dcmtk STATIC
   ${CMAKE_SOURCE_DIR}/dummy.cpp
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/ExportedSymbolsPlugins.list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancFramework/Resources/ExportedSymbolsPlugins.list	Thu Jun 11 10:05:26 2020 +0200
@@ -0,0 +1,7 @@
+# This is the list of the symbols that must be exported by Orthanc
+# plugins, if targeting OS X
+
+_OrthancPluginInitialize
+_OrthancPluginFinalize
+_OrthancPluginGetName
+_OrthancPluginGetVersion
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/Samples/MicroService/CMakeLists.txt
--- a/OrthancFramework/Resources/Samples/MicroService/CMakeLists.txt	Thu Jun 11 09:18:30 2020 +0200
+++ b/OrthancFramework/Resources/Samples/MicroService/CMakeLists.txt	Thu Jun 11 10:05:26 2020 +0200
@@ -2,15 +2,14 @@
 
 project(Sample)
 
-include(${CMAKE_SOURCE_DIR}/../../../CMake/OrthancFrameworkParameters.cmake)
+include(${CMAKE_SOURCE_DIR}/../../CMake/OrthancFrameworkParameters.cmake)
 
+set(ENABLE_ZLIB ON)
 set(ENABLE_WEB_SERVER ON)
 
-include(${CMAKE_SOURCE_DIR}/../../../CMake/OrthancFrameworkConfiguration.cmake)
+include(${CMAKE_SOURCE_DIR}/../../CMake/OrthancFrameworkConfiguration.cmake)
 
 add_executable(Sample
   ${ORTHANC_CORE_SOURCES}
   Sample.cpp
   )
-
-include_directories(${ORTHANC_ROOT}/Core)
diff -r 64919a9958bb -r 47e9e788224c OrthancFramework/Resources/Samples/MicroService/Sample.cpp
--- a/OrthancFramework/Resources/Samples/MicroService/Sample.cpp	Thu Jun 11 09:18:30 2020 +0200
+++ b/OrthancFramework/Resources/Samples/MicroService/Sample.cpp	Thu Jun 11 10:05:26 2020 +0200
@@ -1,9 +1,9 @@
 #include <stdio.h>
 
-#include <HttpServer/MongooseServer.h>
-#include <Logging.h>
-#include <RestApi/RestApi.h>
-#include <SystemToolbox.h>
+#include "../../../Sources/HttpServer/HttpServer.h"
+#include "../../../Sources/Logging.h"
+#include "../../../Sources/RestApi/RestApi.h"
+#include "../../../Sources/SystemToolbox.h"
 
 class MicroService : public Orthanc::RestApi
 {
@@ -43,7 +43,7 @@
   MicroService rest;
   
   {
-    Orthanc::MongooseServer httpServer;
+    Orthanc::HttpServer httpServer;
     httpServer.SetPortNumber(8000);
     httpServer.Register(rest);
     httpServer.SetRemoteAccessAllowed(true);
diff -r 64919a9958bb -r 47e9e788224c OrthancServer/Plugins/Samples/Common/ExportedSymbols.list
--- a/OrthancServer/Plugins/Samples/Common/ExportedSymbols.list	Thu Jun 11 09:18:30 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# This is the list of the symbols that must be exported by Orthanc
-# plugins, if targeting OS X
-
-_OrthancPluginInitialize
-_OrthancPluginFinalize
-_OrthancPluginGetName
-_OrthancPluginGetVersion