Fixing Qt 5.4 static debug build, terminating 64-bit process on uninstallation

Author: axelstudios

CMakeLists.txt

@@ -56,20 +56,20 @@ if(BUILD_STATIC)
   get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
   get_filename_component(QT_LIB_DIR ${QtCore_LOCATION} PATH)
 
-  find_library(HARFBUZZ qtharfbuzzng ${QT_LIB_DIR})
-  mark_as_advanced(HARFBUZZ)
-  target_link_libraries(MouseSim Qt5::OpenGL OpenGL32 ${HARFBUZZ} imm32 winmm ws2_32)
+  target_link_libraries(MouseSim Qt5::OpenGL OpenGL32 imm32 winmm ws2_32)
 
+  find_library(HARFBUZZ qtharfbuzzng ${QT_LIB_DIR})
   find_library(PLATFORM_SUPPORT Qt5PlatformSupport ${QT_LIB_DIR})
   find_library(WIN_PLATFORM qwindows ${QT_LIB_DIR}/../plugins/platforms/)
-  mark_as_advanced(PLATFORM_SUPPORT WIN_PLATFORM)
-  target_link_libraries(MouseSim optimized ${PLATFORM_SUPPORT} optimized ${WIN_PLATFORM})
+  mark_as_advanced(HARFBUZZ PLATFORM_SUPPORT WIN_PLATFORM)
+  target_link_libraries(MouseSim optimized ${HARFBUZZ} optimized ${PLATFORM_SUPPORT} optimized ${WIN_PLATFORM})
 
+  find_library(HARFBUZZ_D qtharfbuzzngd ${QT_LIB_DIR})
   find_library(PLATFORM_SUPPORT_D Qt5PlatformSupportd ${QT_LIB_DIR})
   find_library(WIN_PLATFORM_D qwindowsd ${QT_LIB_DIR}/../plugins/platforms/)
-  mark_as_advanced(PLATFORM_SUPPORT_D WIN_PLATFORM_D)
-  if(NOT ${PLATFORM_SUPPORT_D} STREQUAL "PLATFORM_SUPPORT_D-NOTFOUND" AND NOT ${WIN_PLATFORM_D} STREQUAL "WIN_PLATFORM_D-NOTFOUND")
-    target_link_libraries(MouseSim debug ${PLATFORM_SUPPORT_D} debug ${WIN_PLATFORM_D})
+  mark_as_advanced(HARFBUZZ_D PLATFORM_SUPPORT_D WIN_PLATFORM_D)
+  if(NOT ${HARFBUZZ_D} STREQUAL "HARFBUZZ_D-NOTFOUND" AND NOT ${PLATFORM_SUPPORT_D} STREQUAL "PLATFORM_SUPPORT_D-NOTFOUND" AND NOT ${WIN_PLATFORM_D} STREQUAL "WIN_PLATFORM_D-NOTFOUND")
+    target_link_libraries(MouseSim debug ${HARFBUZZ_D} debug ${PLATFORM_SUPPORT_D} debug ${WIN_PLATFORM_D})
   else()
     set(CMAKE_CONFIGURATION_TYPES "Release" CACHE STRING "Build Configuration" FORCE)
   endif()

NSIS.template.in

@@ -589,7 +589,7 @@ FunctionEnd
   @CPACK_NSIS_PAGE_COMPONENTS@
 
   !insertmacro MUI_PAGE_INSTFILES
-  !define MUI_FINISHPAGE_RUN "$INSTDIR\MouseSim.exe"
+  !define MUI_FINISHPAGE_RUN "$INSTDIR\@CPACK_NSIS_PACKAGE_NAME@.exe"
   !insertmacro MUI_PAGE_FINISH
 
   !insertmacro MUI_UNPAGE_CONFIRM
@@ -840,6 +840,8 @@ FunctionEnd
 ;Uninstaller Section
 
 Section "Uninstall"
+  KillProcWMI::KillProc "@[email protected]"
+
   ReadRegStr $START_MENU SHCTX \
    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "StartMenu"
   ;MessageBox MB_OK "Start menu is in: $START_MENU"