From d0076e24a7239acbc6507069e430fb965f6ede8f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 4 Jul 2020 15:21:55 +0200
Subject: [PATCH] Get rid of WINDOWS_EXT completely as it is now no longer used

---
 cmake/modules/AppTarget.cmake     |  5 -----
 cmake/modules/LibraryTarget.cmake | 16 +++-------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/cmake/modules/AppTarget.cmake b/cmake/modules/AppTarget.cmake
index 9b4d6fa..0bb66be 100644
--- a/cmake/modules/AppTarget.cmake
+++ b/cmake/modules/AppTarget.cmake
@@ -15,11 +15,6 @@ if (NOT "${META_PROJECT_TYPE}" STREQUAL "application")
     )
 endif ()
 
-# set the windows extension to "exe", this is required by the mingw-w64-specific WindowsResources module
-if (MINGW)
-    set(WINDOWS_EXT ".exe")
-endif ()
-
 # define relevant files
 set(ALL_FILES
     ${HEADER_FILES}
diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake
index b73dadd..aa2f8c0 100644
--- a/cmake/modules/LibraryTarget.cmake
+++ b/cmake/modules/LibraryTarget.cmake
@@ -44,11 +44,6 @@ if (MINGW AND NOT VERSIONED_MINGW_LIBRARIES)
     set(CMAKE_SHARED_LIBRARY_PREFIX "")
 endif ()
 
-# set the Windows library suffix, this is also required by the mingw-w64 specific WindowsResources module as well
-if (MINGW)
-    set(WINDOWS_EXT ".dll")
-endif ()
-
 # set compile definitions for static build
 if (NOT BUILD_SHARED_LIBS)
     list(APPEND META_PUBLIC_COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_STATIC)
@@ -82,13 +77,6 @@ if (NOT META_SOVERSION AND NOT META_IS_PLUGIN)
     endif ()
 endif ()
 
-# incorporate the SOVERSION into the library name for mingw-w64 targets
-if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN
-    AND MINGW
-    AND VERSIONED_MINGW_LIBRARIES)
-    set(WINDOWS_EXT "-${META_SOVERSION}${WINDOWS_EXT}")
-endif ()
-
 # define relevant files
 set(ALL_FILES
     ${HEADER_FILES}
@@ -173,10 +161,12 @@ else ()
     if (META_PLUGIN_CATEGORY)
         set_target_properties(${META_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${META_PLUGIN_CATEGORY}")
     endif ()
+
+    # incorporate the SOVERSION into the library name for mingw-w64 targets
     if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN
         AND MINGW
         AND VERSIONED_MINGW_LIBRARIES)
-        set_target_properties(${META_TARGET_NAME} PROPERTIES SUFFIX "${WINDOWS_EXT}")
+        set_target_properties(${META_TARGET_NAME} PROPERTIES SUFFIX "-${META_SOVERSION}.dll")
     endif ()
 endif ()