--- 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