diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2021-12-15 15:48:10 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2021-12-15 16:40:15 +0100 |
| commit | 8589e9598a3265d965dd34383841d31443ba9f22 (patch) | |
| tree | 07547d792d7cd727e5d99e43e0a916613d511356 | |
| parent | bf2c3f3d8901d876e67eb768562bba2c2a282093 (diff) | |
| download | libexpat-git-8589e9598a3265d965dd34383841d31443ba9f22.tar.gz | |
CMake: Ensure libexpat*.lib filenames with MSVCfix-msvc-lib-files-naming
This fixes a post-2.4.1 regression from
commit 3486fd6e3d2bc269660cedd3befa1ae649d1dcf4
introduced by pull request #495.
| -rw-r--r-- | expat/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | expat/Changes | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index bccda81c..11797a5c 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -401,7 +401,10 @@ if(WIN32 AND NOT MINGW) # NOTE: This avoids a name collision with Expat.dll of Perl's XML::Parser::Expat # on Windows by resorting to filename libexpat.dll since Expat 1.95.3. # Everything but MSVC is already adding prefix "lib", automatically. - set_property(TARGET expat PROPERTY PREFIX lib) + # NOTE: "set_property(TARGET expat PROPERTY PREFIX lib)" would only affect *.dll + # files but not *.lib files, so we have to rely on propert OUTPUT_NAME, instead. + # Property CMAKE_*_POSTFIX still applies. + set_property(TARGET expat PROPERTY OUTPUT_NAME libexpat) endif() target_include_directories(expat diff --git a/expat/Changes b/expat/Changes index 578a48d7..f566cbf3 100644 --- a/expat/Changes +++ b/expat/Changes @@ -9,7 +9,7 @@ Release 2.4.2 xxx xxx xx xxxx #497 Autotools: Include files with release archives: - buildconf.sh - fuzz/*.c - #495 CMake: MinGW: Fix pkg-config section "Libs" for + #495 #524 CMake: MinGW: Fix pkg-config section "Libs" for - non-release build types (e.g. -DCMAKE_BUILD_TYPE=Debug) - multi-config CMake generators (e.g. Ninja Multi-Config) #522 #523 docs: Fix return value docs for both |