Merge pull request #12501 from BusyJay/fix-cares-build

cmake: fix cares configuration
7 years ago · 804bd6aa6b
parent 561f72f418 d6c4e937ce
commit 804bd6aa6b
2 changed files with 4 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -132,7 +132,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "module")
  if(NOT CARES_ROOT_DIR)
    set(CARES_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cares/cares)
  endif()
-  set(CARES_STATIC ON)
+  set(CARES_SHARED OFF CACHE BOOL "disable shared library")
+  set(CARES_STATIC ON CACHE BOOL "link cares statically")
  set(CARES_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cares/cares")
  add_subdirectory(third_party/cares/cares)
  if(TARGET c-ares)
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@ -177,7 +177,8 @@
    if(NOT CARES_ROOT_DIR)
      set(CARES_ROOT_DIR <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/third_party/cares/cares)
    endif()
-    set(CARES_STATIC ON)
+    set(CARES_SHARED OFF CACHE BOOL "disable shared library")
+    set(CARES_STATIC ON CACHE BOOL "link cares statically")
    set(CARES_INCLUDE_DIR "<%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/third_party/cares/cares")
    add_subdirectory(third_party/cares/cares)
    if(TARGET c-ares)