From 1654c8ec8f3ea6b165d68c69a06e9ae4e7a5e273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Wed, 9 Feb 2022 12:22:51 +0100 Subject: [PATCH] Add a proper option to toggle between tinyglib and glib proper --- src/network/slirp/CMakeLists.txt | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/network/slirp/CMakeLists.txt b/src/network/slirp/CMakeLists.txt index 1f0458bdb..5bb4bceca 100644 --- a/src/network/slirp/CMakeLists.txt +++ b/src/network/slirp/CMakeLists.txt @@ -17,23 +17,18 @@ add_library(slirp STATIC arp_table.c bootp.c cksum.c dnssearch.c if.c ip_icmp.c ip_input.c ip_output.c mbuf.c misc.c sbuf.c slirp.c socket.c tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c udp.c util.c version.c) -if (CMAKE_SYSTEM_NAME MATCHES "Windows") - target_link_libraries(slirp wsock32 iphlpapi) +if(WIN32) + target_link_libraries(slirp wsock32 iphlpapi) endif() -if(QT) - if(UNIX AND NOT APPLE) +option(SLIRP_GLIB "Use GLib proper with SLiRP" OFF) + +if(SLIRP_GLIB) find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB_PKG IMPORTED_TARGET glib-2.0) - if (GLIB_PKG_FOUND) - target_compile_definitions(slirp PRIVATE TINYGLIB_USE_GLIB) - target_link_libraries(slirp PkgConfig::GLIB_PKG) - else() - message(ERROR "GLib development headers are required when compiling with Qt on Unix") - endif() - else() - target_sources(slirp PRIVATE tinyglib.c) - endif() + pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) + target_link_libraries(slirp PkgConfig::GLIB) + + target_compile_definitions(slirp PRIVATE TINYGLIB_USE_GLIB) else() - target_sources(slirp PRIVATE tinyglib.c) + target_sources(slirp PRIVATE tinyglib.c) endif()