summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--externals/CMakeLists.txt7
-rw-r--r--src/core/CMakeLists.txt7
-rw-r--r--src/web_service/CMakeLists.txt7
3 files changed, 9 insertions, 12 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 61ad3487a..a1d0452c3 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -86,7 +86,10 @@ if (ENABLE_WEB_SERVICE)
86 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") 86 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
87 add_subdirectory(libressl EXCLUDE_FROM_ALL) 87 add_subdirectory(libressl EXCLUDE_FROM_ALL)
88 target_include_directories(ssl INTERFACE ./libressl/include) 88 target_include_directories(ssl INTERFACE ./libressl/include)
89 target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP) 89 target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
90 get_directory_property(OPENSSL_LIBRARIES
91 DIRECTORY libressl
92 DEFINITION OPENSSL_LIBS)
90 93
91 # lurlparser 94 # lurlparser
92 add_subdirectory(lurlparser EXCLUDE_FROM_ALL) 95 add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
@@ -94,6 +97,8 @@ if (ENABLE_WEB_SERVICE)
94 # httplib 97 # httplib
95 add_library(httplib INTERFACE) 98 add_library(httplib INTERFACE)
96 target_include_directories(httplib INTERFACE ./httplib) 99 target_include_directories(httplib INTERFACE ./httplib)
100 target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
101 target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
97 102
98 # JSON 103 # JSON
99 add_library(json-headers INTERFACE) 104 add_library(json-headers INTERFACE)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 66497a386..c15d9f52f 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -591,11 +591,8 @@ target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
591target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt json-headers mbedtls opus unicorn) 591target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt json-headers mbedtls opus unicorn)
592 592
593if (YUZU_ENABLE_BOXCAT) 593if (YUZU_ENABLE_BOXCAT)
594 get_directory_property(OPENSSL_LIBS 594 target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT)
595 DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl 595 target_link_libraries(core PRIVATE httplib json-headers zip)
596 DEFINITION OPENSSL_LIBS)
597 target_compile_definitions(core PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT -DYUZU_ENABLE_BOXCAT)
598 target_link_libraries(core PRIVATE httplib json-headers ${OPENSSL_LIBS} zip)
599endif() 596endif()
600 597
601if (ENABLE_WEB_SERVICE) 598if (ENABLE_WEB_SERVICE)
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index 01f2d129d..0c9bb0d55 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -8,9 +8,4 @@ add_library(web_service STATIC
8) 8)
9 9
10create_target_directory_groups(web_service) 10create_target_directory_groups(web_service)
11 11target_link_libraries(web_service PRIVATE common json-headers httplib lurlparser)
12get_directory_property(OPENSSL_LIBS
13 DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl
14 DEFINITION OPENSSL_LIBS)
15target_compile_definitions(web_service PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT)
16target_link_libraries(web_service PRIVATE common json-headers ${OPENSSL_LIBS} httplib lurlparser)