diff --git a/CMakeLists.txt b/CMakeLists.txt
index facc1c999f..9031183d85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,6 +337,13 @@ if (BUILD_GPU_FRAME_PLAYER_ONLY)
     add_subdirectory(tools/gpu-frame-player)
 else()
 
+if (SCREENSHARE)
+  add_subdirectory(screenshare)
+endif()
+
+# BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
+add_subdirectory(tools)
+
 # add subdirectories for all targets
 if (BUILD_SERVER)
   add_subdirectory(assignment-client)
@@ -363,13 +370,6 @@ if (BUILD_CLIENT OR BUILD_SERVER)
   add_subdirectory(server-console)
 endif()
 
-if (SCREENSHARE)
-  add_subdirectory(screenshare)
-endif()
-
-# BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
-add_subdirectory(tools)
-
 endif()
 
 if (BUILD_TESTS)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 8d15ccc22e..8067e800a5 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -335,7 +335,7 @@ if (APPLE)
       "${RESOURCES_DEV_DIR}/scripts"
     # copy JSDoc files beside the executable
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
-      "${CMAKE_CURRENT_BINARY_DIR}/tools/jsdoc"
+      "${JSDOC_OUTPUT_PATH}"
       "${RESOURCES_DEV_DIR}/jsdoc"
     # copy the resources files beside the executable
     COMMAND "${CMAKE_COMMAND}" -E copy_if_different
@@ -395,9 +395,9 @@ else()
       "${PROJECT_SOURCE_DIR}/resources/serverless/redirect.json"
       "${RESOURCES_DEV_DIR}/serverless/redirect.json"
     # copy JSDoc files beside the executable
-#    COMMAND "${CMAKE_COMMAND}" -E copy_directory
-#      "${CMAKE_CURRENT_BINARY_DIR}/tools/jsdoc/out"
-#      "${INTERFACE_EXEC_DIR}/jsdoc"
+    COMMAND "${CMAKE_COMMAND}" -E copy_directory
+      "${JSDOC_OUTPUT_PATH}"
+      "${INTERFACE_EXEC_DIR}/jsdoc"
   )
 
   # link target to external libraries
diff --git a/tools/jsdoc/CMakeLists.txt b/tools/jsdoc/CMakeLists.txt
index 3c8245f0d9..5a062b7ee9 100644
--- a/tools/jsdoc/CMakeLists.txt
+++ b/tools/jsdoc/CMakeLists.txt
@@ -12,6 +12,8 @@ file(TO_NATIVE_PATH ${JSDOC_WORKING_DIR}/config.json JSDOC_CONFIG_PATH)
 file(TO_NATIVE_PATH ${JSDOC_OUTPUT_DIR}/out OUTPUT_DIR)
 file(TO_NATIVE_PATH ${JSDOC_WORKING_DIR}/root.js NATIVE_JSDOC_WORKING_DIR)
 
+set(JSDOC_OUTPUT_PATH ${OUTPUT_DIR} CACHE INTERNAL "${PROJECT_NAME}: JSDoc output directory")
+
 add_custom_command(TARGET ${TARGET_NAME}
   COMMAND ${NPM_EXECUTABLE} --no-progress install && ${JSDOC_PATH} ${NATIVE_JSDOC_WORKING_DIR} -c ${JSDOC_CONFIG_PATH} -d ${OUTPUT_DIR}
   WORKING_DIRECTORY ${JSDOC_WORKING_DIR}