diff --git a/3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt b/3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt index 682602e268..56379cd6d0 100644 --- a/3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt +++ b/3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt @@ -91,8 +91,13 @@ add_library(rappture ${SRC_RAPPTURE_CORE}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/core/) -find_package(EXPAT REQUIRED) -target_link_libraries(rappture PRIVATE EXPAT::EXPAT) +find_package(expat CONFIG REQUIRED) + +if(WIN32 AND NOT MINGW) + target_link_libraries(rappture PRIVATE expat::libexpat) +else() + target_link_libraries(rappture PRIVATE expat::expat) +endif() install(TARGETS rappture RUNTIME DESTINATION bin diff --git a/win_build/wrappture_example_vs2019.vcxproj b/win_build/wrappture_example_vs2019.vcxproj index 2ecd98cb75..902df9a230 100644 --- a/win_build/wrappture_example_vs2019.vcxproj +++ b/win_build/wrappture_example_vs2019.vcxproj @@ -98,7 +98,7 @@ 0x0409 - rappture.lib;expat.lib;libcmt.lib;libcpmt.lib;zlib.lib;%(AdditionalDependencies) + rappture.lib;libexpatMD.lib;libcmt.lib;libcpmt.lib;zlib.lib;%(AdditionalDependencies) true false %(DelayLoadDLLs) @@ -141,7 +141,7 @@ 0x0409 - rappture.lib;expat.lib;libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;zlibd.lib;%(AdditionalDependencies) + rappture.lib;libexpatdMD.lib;libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;zlibd.lib;%(AdditionalDependencies) true false %(DelayLoadDLLs)