[desktop] Organize desktop resources

Signed-off-by: Andrei Shkrob <github@shkrob.dev>

.forgejo/workflows/desktop-file-check.yaml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.comaps.comaps.desktop
+      - qt/res/linux/app.comaps.comaps.desktop
       - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.comaps.comaps.desktop
+            qt/res/linux/app.comaps.comaps.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/linux/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"

.gitignore

@@ -50,7 +50,7 @@ omim.sdf
 *.suo
 *.aps
 *.rc
-!qt/res/windows.rc
+!qt/res/windows/windows.rc
 *.pdb
 out/
 

qt/CMakeLists.txt

@@ -93,11 +93,8 @@ set(RESOURCES_FOLDER ${BUNDLE_FOLDER}/Contents/Resources)
 set(DATA_DIR ${OMIM_ROOT}/data)
 
 execute_process(
-  COMMAND mkdir -p ${RESOURCES_FOLDER}/shaders_compiler
-  COMMAND cp ${PROJECT_SOURCE_DIR}/res/mac.icns ${RESOURCES_FOLDER}
-  COMMAND cp ${PROJECT_SOURCE_DIR}/res/designer.icns ${RESOURCES_FOLDER}
+    COMMAND mkdir -p ${RESOURCES_FOLDER}/shaders_compiler
 )
-
 function(copy_resources)
   foreach(file ${ARGN})
     execute_process(
@@ -138,7 +135,7 @@ install(DIRECTORY ${OMIM_ROOT}/data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/co
 
 if (PLATFORM_LINUX)
   install(FILES ${OMIM_ROOT}/packaging/app.comaps.comaps.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/)
-  install(FILES ${OMIM_ROOT}/qt/res/app.comaps.comaps.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
+  install(FILES ${OMIM_ROOT}/qt/res/linux/app.comaps.comaps.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
   install(FILES ${OMIM_ROOT}/qt/res/logo.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps/ RENAME comaps.png)
 endif()
 
@@ -151,6 +148,15 @@ if (PLATFORM_MAC)
   execute_process(
     COMMAND cp -r ${OMIM_ROOT}/tools/shaders_compiler/macos ${RESOURCES_FOLDER}/shaders_compiler
   )
+  if (BUILD_DESIGNER)
+    execute_process(
+        COMMAND cp ${PROJECT_SOURCE_DIR}/res/mac/designer.icns ${RESOURCES_FOLDER}
+    )
+  else ()
+    execute_process(
+        COMMAND cp ${PROJECT_SOURCE_DIR}/res/mac/mac.icns ${RESOURCES_FOLDER}
+    )
+  endif ()
 elseif (PLATFORM_LINUX)
   execute_process(
     COMMAND cp -r ${OMIM_ROOT}/tools/shaders_compiler/linux ${RESOURCES_FOLDER}/shaders_compiler
@@ -164,17 +170,17 @@ if (PLATFORM_MAC)
     set(BUNDLE_VERSION ${APP_VERSION})
   endif()
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/res/Info.plist)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/mac/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/generated/Info.plist)
 
   set_target_properties(${PROJECT_NAME}
     PROPERTIES
       OUTPUT_NAME ${BUNDLE_NAME}
-      MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/res/Info.plist
+      MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/generated/Info.plist
   )
 endif()
 
 if (PLATFORM_WIN)
-  target_sources(${PROJECT_NAME} PRIVATE res/windows.rc)
+  target_sources(${PROJECT_NAME} PRIVATE res/windows/windows.rc)
 endif()
 
 if (BUILD_DESIGNER)
@@ -237,7 +243,7 @@ if (BUILD_DESIGNER)
   set(CPACK_GENERATOR DragNDrop)
   set(CPACK_DMG_FORMAT UDZO)
   set(CPACK_DMG_VOLUME_NAME ${BUNDLE_NAME})
-  set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/res/designer.icns)
+  set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/res/mac/designer.icns)
   include(CPack)
 elseif (BUILD_STANDALONE)
   add_custom_command(TARGET desktop POST_BUILD