diff --git a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
index bdf51f41ced..14204398dd3 100644
--- a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
+++ b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
@@ -42,14 +42,25 @@ install(
   DESTINATION "${CGAL_INSTALL_INC_DIR}/CGAL/Qt"
   COMPONENT CGAL_Qt5)
 if(CGAL_HEADER_ONLY)
-  install(
-    DIRECTORY "../../demo/resources/"
-    DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources"
-    COMPONENT CGAL_Qt5)
-  install(
-    DIRECTORY "../../demo/icons/"
-    DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons"
-    COMPONENT CGAL_Qt5)
+  if(EXISTS ${CGAL_MODULES_DIR}/demo/resources)
+    install(
+      DIRECTORY "${CGAL_MODULES_DIR}/demo/resources/"
+      DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources"
+      COMPONENT CGAL_Qt5)
+    install(
+      DIRECTORY "${CGAL_MODULES_DIR}/demo/icons/"
+      DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons"
+      COMPONENT CGAL_Qt5)
+  else()
+    install(
+      DIRECTORY "../../demo/resources/"
+      DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources"
+      COMPONENT CGAL_Qt5)
+    install(
+      DIRECTORY "../../demo/icons/"
+      DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons"
+      COMPONENT CGAL_Qt5)
+  endif()
 endif()
 
 message("libCGAL_Qt5 is configured")
diff --git a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
index cfaa4eaaa8c..3f2cce6a01d 100644
--- a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
+++ b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
@@ -158,6 +158,8 @@ if(EXISTS ${GIT_REPO}/Maintenance/release_building/public_release_name)
   file(COPY "${GIT_REPO}/Maintenance/release_building/public_release_name"
     DESTINATION "${release_dir}/doc")
 endif()
+file(COPY ${GIT_REPO}/GraphicsView/demo/resources ${GIT_REPO}/GraphicsView/demo/icons
+  DESTINATION "${release_dir}/cmake/modules")
 
 #create VERSION
 file(WRITE ${release_dir}/VERSION "${CGAL_VERSION}")