cmake: add code to detect system brotli library (#952)

microsoft · Nov 12, 2018 · f3824aa · f3824aa
1 parent 19d2ebb
commit f3824aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Release/cmake/cpprest_find_brotli.cmake b/Release/cmake/cpprest_find_brotli.cmake
@@ -3,8 +3,17 @@ function(cpprest_find_brotli)
     return()
   endif()
 
-  find_package(unofficial-brotli REQUIRED)
 
-  add_library(cpprestsdk_brotli_internal INTERFACE)
-  target_link_libraries(cpprestsdk_brotli_internal INTERFACE unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon)
+  find_package(PkgConfig)
+  pkg_check_modules(BROTLIENC libbrotlienc)
+  pkg_check_modules(BROTLIDEC libbrotlidec)
+  if(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
+	  target_link_libraries(cpprest PRIVATE ${BROTLIDEC_LDFLAGS} ${BROTLIENC_LDFLAGS})
+  else(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
+    find_package(unofficial-brotli REQUIRED)
+    add_library(cpprestsdk_brotli_internal INTERFACE)
+    target_link_libraries(cpprestsdk_brotli_internal INTERFACE unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon)
+    target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal)
+  endif(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
+
 endfunction()
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
@@ -84,7 +84,6 @@ else()
     target_compile_definitions(cpprest PRIVATE -DCPPREST_EXCLUDE_BROTLI=1)
   else()
     cpprest_find_brotli()
-    target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal)
   endif()
 endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,6 @@ else() @@
         target_compile_definitions(cpprest PRIVATE -DCPPREST_EXCLUDE_BROTLI=1)
       else()
         cpprest_find_brotli()
-        target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal)
       endif()
     endif()
@@ Expand Down @@