CMake: Re-introduce MT/MD postfix for static windows .lib files

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index a91679e1428062228368733cc403f68cfdfcb7aa..e7c7b28c9fd6f79d419b76b2bb857701771572ac 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -187,6 +187,14 @@ if(WIN32)
         set(_POSTFIX_WIDE "w")
     endif()
 
+    if(NOT BUILD_shared)
+        if(MSVC_USE_STATIC_CRT)
+            set(_POSTFIX_CRT "MT")
+        else()
+            set(_POSTFIX_CRT "MD")
+        endif()
+    endif()
+
     foreach(postfix_var
             CMAKE_DEBUG_POSTFIX
             CMAKE_RELEASE_POSTFIX
@@ -199,7 +207,7 @@ if(WIN32)
             set(_POSTFIX_DEBUG "")
         endif()
 
-        set(${postfix_var} "${_POSTFIX_WIDE}${_POSTFIX_DEBUG}" CACHE STRING "Windows binary postfix, e.g. expat<postfix=[w][d]>.dll")
+        set(${postfix_var} "${_POSTFIX_WIDE}${_POSTFIX_DEBUG}${_POSTFIX_CRT}" CACHE STRING "Windows binary postfix, e.g. expat<postfix=[w][d][MD|MT]>.lib")
     endforeach()
 endif(WIN32)
 

diff --git a/expat/Changes b/expat/Changes
index 74b4806e90eac1b427db1efff7637362e5c5c3f6..1a9eaf682769b45a86c7f2e8cf4b9a822c5e53e4 100644 (file)
--- a/expat/Changes
+++ b/expat/Changes
@@ -27,7 +27,7 @@ Release x.x.x xxx xxx xx xxxx
             #265  CMake: Fix linking with MinGW
             #316  CMake: Windows: Make binary postfix match MSVC
                     Old: expat[d].lib
-                    New: expat[w][d].lib
+                    New: expat[w][d][MD|MT].lib
                   CMake: Migrate files from Windows to Unix line endings
        #299 #302  Windows: Replace LoadLibrary hack to access
                     unofficial API function SystemFunction036 (RtlGenRandom)

diff --git a/expat/win32/build_expat_iss.bat b/expat/win32/build_expat_iss.bat
index 93f8fa4530feb98b10cdfa0e97297d894f92ac12..803045762c1254d845a2227e51c81d3ba9959fb8 100644 (file)
--- a/expat/win32/build_expat_iss.bat
+++ b/expat/win32/build_expat_iss.bat
@@ -57,7 +57,7 @@ CD build_static_char || EXIT /b 1
     msbuild /m expat.sln || EXIT /b 1
     DIR %CONFIGURATION% || EXIT /b 1
     CD .. || EXIT /b 1
-COPY build_static_char\%CONFIGURATION%\expat.lib %BINDIR%\expatMT.lib || EXIT /b 1
+COPY build_static_char\%CONFIGURATION%\expatMT.lib %BINDIR%\ || EXIT /b 1
 COPY build_static_char\xmlwf\%CONFIGURATION%\xmlwf.exe %BINDIR%\ || EXIT /b 1
 
 
@@ -77,7 +77,7 @@ CD build_static_wchar_t || EXIT /b 1
     msbuild /m expat.sln || EXIT /b 1
     DIR %CONFIGURATION% || EXIT /b 1
     CD .. || EXIT /b 1
-COPY build_static_wchar_t\%CONFIGURATION%\expatw.lib %BINDIR%\expatwMT.lib || EXIT /b 1
+COPY build_static_wchar_t\%CONFIGURATION%\expatwMT.lib %BINDIR%\ || EXIT /b 1
 
 
 DIR %BINDIR% || EXIT /b 1