diff --git a/resources/scripts/clang-format/clang-format.exe b/resources/scripts/clang-format/clang-format.exe index 6b027d801..84beede49 100755 Binary files a/resources/scripts/clang-format/clang-format.exe and b/resources/scripts/clang-format/clang-format.exe differ diff --git a/src/rssguard/CMakeLists.txt b/src/rssguard/CMakeLists.txt index 18c8cdad0..c3100f743 100644 --- a/src/rssguard/CMakeLists.txt +++ b/src/rssguard/CMakeLists.txt @@ -60,16 +60,20 @@ elseif((MINGW AND BUILD_MSYS2) OR (UNIX AND NOT APPLE AND NOT ANDROID)) install(TARGETS app DESTINATION ${CMAKE_INSTALL_BINDIR} ) - install(FILES ${CMAKE_BINARY_DIR}/${APP_REVERSE_NAME}.desktop - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications - ) - install(FILES ${CMAKE_BINARY_DIR}/${APP_REVERSE_NAME}.metainfo.xml - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo - ) - install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps - RENAME ${APP_REVERSE_NAME}.png - ) + + if (NOT BUILD_MSYS2) + # MSYS2 ecosystem does not need/want these files. + install(FILES ${CMAKE_BINARY_DIR}/${APP_REVERSE_NAME}.desktop + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications + ) + install(FILES ${CMAKE_BINARY_DIR}/${APP_REVERSE_NAME}.metainfo.xml + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo + ) + install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps + RENAME ${APP_REVERSE_NAME}.png + ) + endif() elseif(APPLE) install(TARGETS app DESTINATION Contents/MacOS