--- a/OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt	Wed Jun 10 20:30:34 2020 +0200
+++ b/OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt	Wed Jun 10 21:27:31 2020 +0200
@@ -5,8 +5,8 @@
 SET(PLUGIN_NAME "connectivity-checks" CACHE STRING "Name of the plugin")
 SET(PLUGIN_VERSION "mainline" CACHE STRING "Version of the plugin")
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../../Resources/CMake/OrthancFrameworkParameters.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../../Resources/CMake/OrthancFrameworkConfiguration.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake)
 
 include(JavaScriptLibraries.cmake)
 
@@ -27,7 +27,7 @@
 endif()  
 
 EmbedResources(
-  --framework-path=${CMAKE_CURRENT_SOURCE_DIR}/../../../Core
+  --framework-path=${ORTHANC_ROOT}/OrthancFramework/Sources
   WEB_RESOURCES  ${CMAKE_CURRENT_SOURCE_DIR}/WebResources
   LIBRARIES      ${JAVASCRIPT_LIBS_DIR}
   )
@@ -39,17 +39,17 @@
   )
 
 include_directories(
-  ${ORTHANC_ROOT}/Plugins/Include/
+  ${ORTHANC_ROOT}/OrthancServer/Plugins/Include/
   )
 
 add_library(ConnectivityChecks SHARED
   ${ADDITIONAL_RESOURCES}
   ${AUTOGENERATED_SOURCES}
   ${ORTHANC_CORE_SOURCES_DEPENDENCIES}
-  ${ORTHANC_ROOT}/Core/Enumerations.cpp
-  ${ORTHANC_ROOT}/Core/Logging.cpp
-  ${ORTHANC_ROOT}/Core/SystemToolbox.cpp
-  ${ORTHANC_ROOT}/Core/Toolbox.cpp
+  ${ORTHANC_ROOT}/OrthancFramework/Sources/Enumerations.cpp
+  ${ORTHANC_ROOT}/OrthancFramework/Sources/Logging.cpp
+  ${ORTHANC_ROOT}/OrthancFramework/Sources/SystemToolbox.cpp
+  ${ORTHANC_ROOT}/OrthancFramework/Sources/Toolbox.cpp
   Plugin.cpp
   )