Merge pull request #524 from libexpat/fix-msvc-lib-files-naming

CMake: Ensure libexpat*.lib filenames with MSVC
This commit is contained in:
Sebastian Pipping 2021-12-15 18:38:17 +01:00 committed by GitHub
commit 2829a27505
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View file

@ -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

View file

@ -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