--- a/OrthancServer/CMakeLists.txt	Mon Apr 25 15:50:57 2022 +0200
+++ b/OrthancServer/CMakeLists.txt	Mon Apr 25 17:32:58 2022 +0200
@@ -316,7 +316,7 @@
   -DHAS_ORTHANC_EXCEPTION=0
   -DMODALITY_WORKLISTS_VERSION="${ORTHANC_VERSION}"
   -DSERVE_FOLDERS_VERSION="${ORTHANC_VERSION}"
-  -DDB_OPTIMIZER_VERSION="${ORTHANC_VERSION}"
+  -DHOUSEKEEPER_VERSION="${ORTHANC_VERSION}"
   )
 
 
@@ -429,7 +429,7 @@
 #####################################################################
 
 if (ENABLE_PLUGINS AND
-    (BUILD_SERVE_FOLDERS OR BUILD_MODALITY_WORKLISTS OR BUILD_DB_OPTIMIZER))
+    (BUILD_SERVE_FOLDERS OR BUILD_MODALITY_WORKLISTS OR BUILD_HOUSEKEEPER))
   add_library(ThirdPartyPlugins STATIC
     ${BOOST_SOURCES}
     ${JSONCPP_SOURCES}
@@ -610,43 +610,43 @@
 ## Build the "Housekeeper" plugin
 #####################################################################
 
-if (ENABLE_PLUGINS AND BUILD_DB_OPTIMIZER)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-execute_process(
-  COMMAND 
-  ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../OrthancFramework/Resources/WindowsResources.py
-  ${ORTHANC_VERSION} Housekeeper Housekeeper.dll "Sample Orthanc plugin to optimize/clean the DB/Storage"
-  ERROR_VARIABLE Failure
-  OUTPUT_FILE ${AUTOGENERATED_DIR}/Housekeeper.rc
-  )
-
-if (Failure)
-  message(FATAL_ERROR "Error while computing the version information: ${Failure}")
-endif()
-
-list(APPEND HOUSEKEEPER_RESOURCES ${AUTOGENERATED_DIR}/Housekeeper.rc)
-endif()
-
-add_library(Housekeeper SHARED 
-${CMAKE_SOURCE_DIR}/Plugins/Samples/Housekeeper/Plugin.cpp
-${HOUSEKEEPER_RESOURCES}
-)
-
-target_link_libraries(Housekeeper 
-  ThirdPartyPlugins
-  )
-
-set_target_properties(
-  Housekeeper PROPERTIES 
-VERSION ${ORTHANC_VERSION} 
-SOVERSION ${ORTHANC_VERSION}
-)
-
-install(
-TARGETS Housekeeper
-RUNTIME DESTINATION lib    # Destination for Windows
-LIBRARY DESTINATION share/orthanc/plugins    # Destination for Linux
-)
+if (ENABLE_PLUGINS AND BUILD_HOUSEKEEPER)
+  if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    execute_process(
+      COMMAND 
+      ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../OrthancFramework/Resources/WindowsResources.py
+      ${ORTHANC_VERSION} Housekeeper Housekeeper.dll "Sample Orthanc plugin to optimize/clean the DB/Storage"
+      ERROR_VARIABLE Failure
+      OUTPUT_FILE ${AUTOGENERATED_DIR}/Housekeeper.rc
+      )
+    
+    if (Failure)
+      message(FATAL_ERROR "Error while computing the version information: ${Failure}")
+    endif()
+    
+    list(APPEND HOUSEKEEPER_RESOURCES ${AUTOGENERATED_DIR}/Housekeeper.rc)
+  endif()
+  
+  add_library(Housekeeper SHARED 
+    ${CMAKE_SOURCE_DIR}/Plugins/Samples/Housekeeper/Plugin.cpp
+    ${HOUSEKEEPER_RESOURCES}
+    )
+  
+  target_link_libraries(Housekeeper 
+    ThirdPartyPlugins
+    )
+  
+  set_target_properties(
+    Housekeeper PROPERTIES 
+    VERSION ${ORTHANC_VERSION} 
+    SOVERSION ${ORTHANC_VERSION}
+    )
+  
+  install(
+    TARGETS Housekeeper
+    RUNTIME DESTINATION lib    # Destination for Windows
+    LIBRARY DESTINATION share/orthanc/plugins    # Destination for Linux
+    )
 endif()