Fix executable path in *.desktop file

cmake/modules/AppTarget.cmake

@@ -112,7 +112,7 @@ endfunction()
 # convenience function to add *.desktop file from project meta data
 function(add_desktop_file)
     add_custom_desktop_file(
-        "${META_PROJECT_NAME}"
+        "${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}"
         "${META_APP_NAME}"
         "${META_APP_DESCRIPTION}"
         "${META_APP_CATEGORIES}"

cmake/modules/WindowsResources.cmake

@@ -24,7 +24,9 @@ if(MINGW)
     set(WINDOWS_ICON_RC_ENTRY "")
     find_program(FFMPEG_BIN ffmpeg avconv)
     if(FFMPEG_BIN)
-        set(PNG_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/hicolor/128x128/apps/${META_PROJECT_NAME}.png")
+        if(NOT "${PNG_ICON_PATH}")
+            set(PNG_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/hicolor/128x128/apps/${META_PROJECT_NAME}.png")
+        endif()
         if(EXISTS "${PNG_ICON_PATH}")
             set(WINDOWS_ICON_PATH "${CMAKE_CURRENT_BINARY_DIR}/${META_PROJECT_NAME}.ico")
             set(WINDOWS_ICON_RC_ENTRY "IDI_ICON1   ICON    DISCARDABLE \"${WINDOWS_ICON_PATH}\"")