blob: 2f61cda953feacbddfd2506329de81530786996b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From f585edfffa79ebbbcb0557be2e889809b76b5def Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Wed, 21 Dec 2016 17:10:54 +0100
Subject: [PATCH 1/2] [cmake] build TestWebServer only if HTTPRequestHandlers
are build
---
xbmc/network/test/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/xbmc/network/test/CMakeLists.txt b/xbmc/network/test/CMakeLists.txt
index 5d1dab328160..a323d1835b07 100644
--- a/xbmc/network/test/CMakeLists.txt
+++ b/xbmc/network/test/CMakeLists.txt
@@ -1,3 +1,5 @@
-set(SOURCES TestWebServer.cpp)
+if(MICROHTTPD_FOUND)
+ set(SOURCES TestWebServer.cpp)
-core_add_test_library(network_test)
+ core_add_test_library(network_test)
+endif()
From f7a514064923d0d693c122cc8fbe3b72cc205820 Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Wed, 21 Dec 2016 17:10:57 +0100
Subject: [PATCH 2/2] [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines,
they are handled trough HAVE_LIBMICROHTTPD (cmake)
---
xbmc/system.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/xbmc/system.h b/xbmc/system.h
index 07dfe87e4a01..26757ca90642 100644
--- a/xbmc/system.h
+++ b/xbmc/system.h
@@ -97,8 +97,6 @@
#define HAS_WIN32_NETWORK
#define HAS_IRSERVERSUITE
#define HAS_AUDIO
-#define HAS_WEB_SERVER
-#define HAS_WEB_INTERFACE
#define HAS_FILESYSTEM_SMB
#define HAS_ZEROCONF
#define HAS_MDNS
|
GitWeb
