From 2a8c2a2589df5696b37a10c859117aa51401d828 Mon Sep 17 00:00:00 2001
From: Petr Mensik <pemensik@redhat.com>
Date: Tue, 18 Jan 2022 22:10:13 +0100
Subject: [PATCH] Try system uvw package if possible
Uvw library is bundled. Try to use system library if cmake can detect
it. Fall back to bundled headers if not found.
---
CMakeLists.txt | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0746c3..467fa49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,14 @@ pkg_search_module(CATCH QUIET catch2>=2.3 catch>=2.3)
pkg_check_modules(LIBDOCOPT docopt)
find_package(nlohmann_json QUIET 3.7.3)
find_package(httplib QUIET)
+find_package(uvw QUIET)
+
+if (NOT uvw_FOUND)
+ set(uvw_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rd/uvw")
+ set(uvw_LIBRARIES )
+else()
+ message(STATUS "Using the system uvw package")
+endif()
# ::-------------------------------------------------------------------------::
# BUILD TARGETS
@@ -129,7 +137,7 @@ set(flamecore_dirs
PUBLIC ${LIBGNUTLS_INCLUDE_DIRS}
PUBLIC ${nlohmann_json_INCLUDE_DIRS}
PUBLIC ${LIBURL_PARSER_INCLUDE_DIRS}
- PUBLIC "${CMAKE_SOURCE_DIR}/3rd/uvw"
+ PUBLIC ${uvw_INCLUDE_DIRS}
)
set(flamecore_libs
@@ -139,6 +147,7 @@ set(flamecore_libs
PRIVATE ${LIBLDNS_LIBRARIES}
PRIVATE ${LIBGNUTLS_LDFLAGS}
PRIVATE ${LIBGNUTLS_LIBRARIES}
+ PRIVATE ${uvw_LIBRARIES}
)
set(flame_execs
--
2.31.1