From 5f30f95e94d9d8ba4eb3d09da110b8e2f9187eb2 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Sun, 16 Sep 2018 20:05:19 +0200 Subject: Add submodules --- externals/CMakeLists.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 53dcf1f1a..c6b175147 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -70,3 +70,28 @@ if(ENABLE_CUBEB) set(BUILD_TESTS OFF CACHE BOOL "") add_subdirectory(cubeb EXCLUDE_FROM_ALL) endif() + +# DiscordRPC +if (USE_DISCORD_PRESENCE) + add_subdirectory(discord-rpc) + target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) +endif() + +if (ENABLE_WEB_SERVICE) + # LibreSSL + set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") + add_definitions(-DHAVE_INET_NTOP) + add_subdirectory(libressl) + target_include_directories(ssl INTERFACE ./libressl/include) + + # lurlparser + add_subdirectory(lurlparser) + + # httplib + add_library(httplib INTERFACE) + target_include_directories(httplib INTERFACE ./httplib) + + # JSON + add_library(json-headers INTERFACE) + target_include_directories(json-headers INTERFACE ./json) +endif() \ No newline at end of file -- cgit v1.2.3 From 120d8f3bf7951b5fbe84b18338381227cf1452f0 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Mon, 17 Sep 2018 20:58:24 +0200 Subject: Address more review comments --- externals/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index c6b175147..6a573881d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -73,7 +73,7 @@ endif() # DiscordRPC if (USE_DISCORD_PRESENCE) - add_subdirectory(discord-rpc) + add_subdirectory(discord-rpc EXCLUDE_FROM_ALL) target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) endif() @@ -81,11 +81,11 @@ if (ENABLE_WEB_SERVICE) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") add_definitions(-DHAVE_INET_NTOP) - add_subdirectory(libressl) + add_subdirectory(libressl EXCLUDE_FROM_ALL) target_include_directories(ssl INTERFACE ./libressl/include) # lurlparser - add_subdirectory(lurlparser) + add_subdirectory(lurlparser EXCLUDE_FROM_ALL) # httplib add_library(httplib INTERFACE) @@ -94,4 +94,4 @@ if (ENABLE_WEB_SERVICE) # JSON add_library(json-headers INTERFACE) target_include_directories(json-headers INTERFACE ./json) -endif() \ No newline at end of file +endif() -- cgit v1.2.3 From aa484688623db59df3ef334a63eff98d98e362f3 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Wed, 19 Sep 2018 20:04:45 +0200 Subject: Review comments - part 3 --- externals/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 6a573881d..1261062e8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -80,9 +80,9 @@ endif() if (ENABLE_WEB_SERVICE) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") - add_definitions(-DHAVE_INET_NTOP) add_subdirectory(libressl EXCLUDE_FROM_ALL) target_include_directories(ssl INTERFACE ./libressl/include) + target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP) # lurlparser add_subdirectory(lurlparser EXCLUDE_FROM_ALL) -- cgit v1.2.3