From ba0501b529bfe5b5e2d7d730a02cc6e46953e282 Mon Sep 17 00:00:00 2001
From: Jake Cobb <william.cobb@varian.com>
Date: Fri, 21 May 2021 18:00:56 -0400
Subject: [PATCH] Problem: MSVC lib names are too complex

Solution: Give an option to use short names
in line with what other platforms (including
mingw on windows) use.

In particular, the shared library names with
toolset and version down to the patch are not
friendly to having just the DLL updated for
e.g. security updates.
---
 CMakeLists.txt | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3467b1aaf..5b7310334e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1297,11 +1297,24 @@ option(BUILD_SHARED "Whether or not to build the shared object" ON)
 option(BUILD_STATIC "Whether or not to build the static archive" ON)
 
 if(MSVC)
+  option(ZMQ_MSVC_SHORT_LIB_NAMES "Use short lib names (e.g. libzmq.lib/dll, libzmq-static.lib) for MSVC" OFF)
+  if(ZMQ_MSVC_SHORT_LIB_NAMES)
+    set(ZMQ_SHARED_RELEASE_POSTFIX "")
+    set(ZMQ_SHARED_DEBUG_POSTFIX "d")
+    set(ZMQ_STATIC_RELEASE_POSTFIX "-static")
+    set(ZMQ_STATIC_DEBUG_POSTFIX "-staticd")
+  else()
+    set(ZMQ_SHARED_RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
+    set(ZMQ_SHARED_DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
+    set(ZMQ_STATIC_RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
+    set(ZMQ_STATIC_DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
+  endif()
+    
   # Suppress linker warnings caused by #ifdef omission of file content.
   set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
   set(PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
   set(PDB_NAME
-      "lib${ZMQ_OUTPUT_BASENAME}${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
+      "lib${ZMQ_OUTPUT_BASENAME}${ZMQ_SHARED_DEBUG_POSTFIX}")
   function(enable_vs_guideline_checker target)
     set_target_properties(
       ${target} PROPERTIES VS_GLOBAL_EnableCppCoreCheck true VS_GLOBAL_CodeAnalysisRuleSet CppCoreCheckRules.ruleset
@@ -1316,11 +1329,10 @@ if(MSVC)
     set_target_properties(
       libzmq
       PROPERTIES PUBLIC_HEADER "${public_headers}"
-                 RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RELWITHDEBINFO_POSTFIX
-                 "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 MINSIZEREL_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
+                 RELEASE_POSTFIX "${ZMQ_SHARED_RELEASE_POSTFIX}"
+                 RELWITHDEBINFO_POSTFIX "${ZMQ_SHARED_RELEASE_POSTFIX}"
+                 MINSIZEREL_POSTFIX "${ZMQ_SHARED_RELEASE_POSTFIX}"
+                 DEBUG_POSTFIX "${ZMQ_SHARED_DEBUG_POSTFIX}"
                  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
                  COMPILE_DEFINITIONS "DLL_EXPORT"
                  OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
@@ -1334,12 +1346,10 @@ if(MSVC)
     set_target_properties(
       libzmq-static
       PROPERTIES PUBLIC_HEADER "${public_headers}"
-                 RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RELWITHDEBINFO_POSTFIX
-                 "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 MINSIZEREL_POSTFIX
-                 "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
+                 RELEASE_POSTFIX "${ZMQ_STATIC_RELEASE_POSTFIX}"
+                 RELWITHDEBINFO_POSTFIX "${ZMQ_STATIC_RELEASE_POSTFIX}"
+                 MINSIZEREL_POSTFIX "${ZMQ_STATIC_RELEASE_POSTFIX}"
+                 DEBUG_POSTFIX "${ZMQ_STATIC_DEBUG_POSTFIX}"
                  COMPILE_FLAGS "/DZMQ_STATIC"
                  OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
   endif()