ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply FixInterfaceIncludes to the slirp package again to work around 

package inconsistencies
This commit is contained in:
Nadia Holmquist Pedersen 2024-08-07 17:28:25 +02:00
parent a174901412
commit b47563e888
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/CMakeLists.txt
View File

@ -1,3 +1,5 @@
include(FixInterfaceIncludes)
add_library(net-utils STATIC add_library(net-utils STATIC
Net.cpp Net.cpp
Net_PCap.cpp Net_PCap.cpp
@ -13,6 +15,7 @@ target_include_directories(net-utils PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
option(USE_SYSTEM_LIBSLIRP "Use system libslirp instead of the bundled version" OFF) option(USE_SYSTEM_LIBSLIRP "Use system libslirp instead of the bundled version" OFF)
if (USE_SYSTEM_LIBSLIRP) if (USE_SYSTEM_LIBSLIRP)
pkg_check_modules(Slirp REQUIRED IMPORTED_TARGET slirp) pkg_check_modules(Slirp REQUIRED IMPORTED_TARGET slirp)
fix_interface_includes(PkgConfig::Slirp)
target_link_libraries(net-utils PRIVATE PkgConfig::Slirp) target_link_libraries(net-utils PRIVATE PkgConfig::Slirp)
else() else()
add_subdirectory(libslirp EXCLUDE_FROM_ALL) add_subdirectory(libslirp EXCLUDE_FROM_ALL)