fix build bug

Author: hks2002

.github/workflows/windows-msvc.yml

@@ -135,17 +135,16 @@ jobs:
           submodules: false
 
       # This step let nmake/ninja could work
-      - name: Setup MSVC-DEV-CMD
-        uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup MSVC-DEV-CMD        
+        uses: seanmiddleditch/gha-setup-vsdevenv@master
 
       - uses: actions/cache@v4
         id: cmake-fetch-content-cache
         with:
           path: |
-            C:/Program Files/c-ares
             C:/Program Files/Botan
             C:/Program Files/OpenSSL
-          key: windows-cmake-fetch-content-${{matrix.build-type}}-${{matrix.tls-provider}}
+          key: windows-fetch-${{matrix.build-type}}-${{matrix.tls-provider}}
 
       - name: Configure Cmake
         # passing "-DFETCHCONTENT_BASE_DIR=D:/a/trantor/_deps" to keep cache

cmake/SetCAres.cmake

@@ -1,35 +1,10 @@
-# build and install c-ares
-macro(build_install_cares)
+# add c-ares
+macro(add_cares)
   if(NOT c-ares_DOWNLOAD_URL)
     get_github_latest_release_url("c-ares" "c-ares")
   endif()
   FetchContent_Declare(c-ares URL ${c-ares_DOWNLOAD_URL})
-  # not using FetchContent_MakeAvailable to save compile time
-  FetchContent_GetProperties(c-ares)
-
-  if(NOT c-ares_POPULATED)
-    FetchContent_Populate(c-ares)
-
-    # configure build and install
-    if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-      execute_process(
-        COMMAND cmake -B ${c-ares_BINARY_DIR} -S ${c-ares_SOURCE_DIR} --fresh -DCARES_BUILD_TOOLS=OFF
-                -DCMAKE_INSTALL_PREFIX=${C-ARES_ROOT_DIR}
-      )
-      execute_process(COMMAND cmake --build ${c-ares_BINARY_DIR} --config Release)
-      execute_process(COMMAND cmake --install ${c-ares_BINARY_DIR} --config Release)
-      execute_process(COMMAND cmake --build ${c-ares_BINARY_DIR} --config Debug)
-      execute_process(COMMAND cmake --install ${c-ares_BINARY_DIR} --config Debug)
-    else()
-      execute_process(
-        COMMAND cmake -B ${c-ares_BINARY_DIR} -S ${c-ares_SOURCE_DIR} --fresh -DCARES_BUILD_TOOLS=OFF
-                -DCMAKE_INSTALL_PREFIX=${C-ARES_ROOT_DIR}
-      )
-      execute_process(COMMAND cmake --build ${c-ares_BINARY_DIR})
-      execute_process(COMMAND cmake --install ${c-ares_BINARY_DIR})
-    endif()
-
-  endif()
+  FetchContent_MakeAvailable(c-ares)
 endmacro()
 
 # Set normal resolver
@@ -55,27 +30,12 @@ macro(set_cares_resolver)
   list(APPEND TRANTOR_SOURCES trantor/net/inner/AresResolver.cc)
   list(APPEND private_headers trantor/net/inner/AresResolver.h)
 
-  # copy dll/libs for Windows, to solve the test/unittests running 0x000135 error
-  copy_files_for_win(${C-ARES_ROOT_DIR}/bin "dll")
-  copy_files_for_win(${C-ARES_ROOT_DIR}/lib "lib")
 endmacro()
 
 # ######################################################################################################################
 message(STATUS "Setting c-ares: ${TRANTOR_USE_C-ARES}")
 
 if(TRANTOR_USE_C-ARES)
-  # Set C-ARES_ROOT_DIR, to let find_package could search from it
-  if(WIN32)
-    set(C-ARES_ROOT_DIR
-        ${CMAKE_INSTALL_PREFIX}/../c-ares
-        CACHE PATH "Let find_package use the directory to find" FORCE
-    )
-  else()
-    set(C-ARES_ROOT_DIR
-        ${CMAKE_INSTALL_PREFIX}/c-ares
-        CACHE PATH "Let find_package use the directory to find" FORCE
-    )
-  endif()
 
   find_package(c-ares)
 
@@ -84,8 +44,7 @@ if(TRANTOR_USE_C-ARES)
       message(STATUS "⚠️c-ares not found, Building it with FetchContent...")
       unset(c-ares_FOUND)
 
-      build_install_cares()
-      find_package(c-ares REQUIRED)
+      add_cares()
 
     else()
       message(FATAL_ERROR "⛔c-ares not found, please install it or set FETCH_BUILD_MISSING_DEPS to ON")