Просмотр исходного кода

externals: Move LibreSSL linking to httplib.

Neither core nor web_services use OpenSSL nor LibreSSL.
However they need to link them as it's a requirement of httplib.
So let's declare this within httplib instead of core and web_services.
Markus Wick 6 лет назад
Родитель
Сommit
fedf750e1b
3 измененных файлов с 9 добавлено и 12 удалено
  1. 6 1
      externals/CMakeLists.txt
  2. 2 5
      src/core/CMakeLists.txt
  3. 1 6
      src/web_service/CMakeLists.txt

+ 6 - 1
externals/CMakeLists.txt

@@ -86,7 +86,10 @@ if (ENABLE_WEB_SERVICE)
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
     add_subdirectory(libressl EXCLUDE_FROM_ALL)
     add_subdirectory(libressl EXCLUDE_FROM_ALL)
     target_include_directories(ssl INTERFACE ./libressl/include)
     target_include_directories(ssl INTERFACE ./libressl/include)
-	target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
+    target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
+    get_directory_property(OPENSSL_LIBRARIES
+        DIRECTORY libressl
+        DEFINITION OPENSSL_LIBS)
 
 
     # lurlparser
     # lurlparser
     add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
     add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
@@ -94,6 +97,8 @@ if (ENABLE_WEB_SERVICE)
     # httplib
     # httplib
     add_library(httplib INTERFACE)
     add_library(httplib INTERFACE)
     target_include_directories(httplib INTERFACE ./httplib)
     target_include_directories(httplib INTERFACE ./httplib)
+    target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
+    target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
 
 
     # JSON
     # JSON
     add_library(json-headers INTERFACE)
     add_library(json-headers INTERFACE)

+ 2 - 5
src/core/CMakeLists.txt

@@ -591,11 +591,8 @@ target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
 target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt json-headers mbedtls opus unicorn)
 target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt json-headers mbedtls opus unicorn)
 
 
 if (YUZU_ENABLE_BOXCAT)
 if (YUZU_ENABLE_BOXCAT)
-    get_directory_property(OPENSSL_LIBS
-        DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl
-        DEFINITION OPENSSL_LIBS)
-    target_compile_definitions(core PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT -DYUZU_ENABLE_BOXCAT)
-    target_link_libraries(core PRIVATE httplib json-headers ${OPENSSL_LIBS} zip)
+    target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT)
+    target_link_libraries(core PRIVATE httplib json-headers zip)
 endif()
 endif()
 
 
 if (ENABLE_WEB_SERVICE)
 if (ENABLE_WEB_SERVICE)

+ 1 - 6
src/web_service/CMakeLists.txt

@@ -8,9 +8,4 @@ add_library(web_service STATIC
 )
 )
 
 
 create_target_directory_groups(web_service)
 create_target_directory_groups(web_service)
-
-get_directory_property(OPENSSL_LIBS
-        DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl
-        DEFINITION OPENSSL_LIBS)
-target_compile_definitions(web_service PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT)
-target_link_libraries(web_service PRIVATE common json-headers ${OPENSSL_LIBS} httplib lurlparser)
+target_link_libraries(web_service PRIVATE common json-headers httplib lurlparser)