again

Author: hks2002

.github/workflows/windows-msvc.yml

@@ -142,8 +142,9 @@ jobs:
         id: cmake-fetch-content-cache
         with:
           path: |
-            C:/Program Files/Botan
-            C:/Program Files/OpenSSL
+            C:/Botan
+            C:/OpenSSL
+            C:/c-ares
           key: windows-fetch-${{matrix.build-type}}-${{matrix.tls-provider}}
 
       - name: Configure Cmake

CMakeLists.txt

@@ -52,12 +52,12 @@ endif()
 # Change TRANTOR_TLS_PROVIDER ON/OFF to String
 if(TRANTOR_TLS_PROVIDER STREQUAL OFF)
   set(TRANTOR_TLS_PROVIDER
-      "botan-3"
+      "none"
       CACHE STRING "" FORCE
   )
 elseif(TRANTOR_TLS_PROVIDER STREQUAL ON)
   set(TRANTOR_TLS_PROVIDER
-      "auto"
+      "botan-3"
       CACHE STRING "" FORCE
   )
 else()

cmake/SetBotan.cmake

@@ -17,22 +17,15 @@ macro(build_install_botan)
     get_lowcase_compiler_id()
 
     # configure build and install
-
+    execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} ${botan_SOURCE_DIR}/configure.py --prefix=${BOTAN_ROOT_DIR}
+              --cc=${cmake_cxx_compiler_id} --disable-deprecated-features --with-pkg-config --build-target=shared
+      WORKING_DIRECTORY ${botan_BINARY_DIR}
+    )
     if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-      execute_process(
-        COMMAND
-          ${PYTHON_EXECUTABLE} ${botan_SOURCE_DIR}/configure.py --prefix=${BOTAN_ROOT_DIR} --cc=${cmake_cxx_compiler_id}
-          --build-tool=ninja --disable-deprecated-features --with-pkg-config --build-target=shared
-        WORKING_DIRECTORY ${botan_BINARY_DIR}
-      )
-      execute_process(COMMAND ninja WORKING_DIRECTORY ${botan_BINARY_DIR})
-      execute_process(COMMAND ninja install WORKING_DIRECTORY ${botan_BINARY_DIR})
+      execute_process(COMMAND nmake WORKING_DIRECTORY ${botan_BINARY_DIR})
+      execute_process(COMMAND nmake install WORKING_DIRECTORY ${botan_BINARY_DIR})
     else()
-      execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} ${botan_SOURCE_DIR}/configure.py --prefix=${BOTAN_ROOT_DIR}
-                --cc=${cmake_cxx_compiler_id} --disable-deprecated-features --with-pkg-config --build-target=shared
-        WORKING_DIRECTORY ${botan_BINARY_DIR}
-      )
       execute_process(COMMAND make -j4 WORKING_DIRECTORY ${botan_BINARY_DIR})
       execute_process(COMMAND make install WORKING_DIRECTORY ${botan_BINARY_DIR})
     endif()
@@ -93,7 +86,7 @@ endif()
 # Set BOTAN_ROOT_DIR, to let find_package could search from it
 if(WIN32)
   set(BOTAN_ROOT_DIR
-      ${CMAKE_INSTALL_PREFIX}/../Botan
+      C:/Botan
       CACHE PATH "Let find_package use the directory to find" FORCE
   )
 else()

cmake/SetCAres.cmake

@@ -1,10 +1,28 @@
-# add c-ares
-macro(add_cares)
+# build and install c-ares
+macro(build_install_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})
-  FetchContent_MakeAvailable(c-ares)
+  # 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, c-ares provided makefiles already, using them to build is faster
+    if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+      execute_process(COMMAND buildconf.bat WORKING_DIRECTORY ${c-ares_SOURCE_DIR})
+      execute_process(COMMAND nmake -f Makefile.msvc WORKING_DIRECTORY ${c-ares_SOURCE_DIR})
+      set(ENV{INSTALL_DIR} ${C-ARES_DIR})
+      execute_process(COMMAND nmake -f Makefile.msvc install WORKING_DIRECTORY ${c-ares_SOURCE_DIR})
+    else()
+      execute_process(COMMAND ./buildconf WORKING_DIRECTORY ${c-ares_SOURCE_DIR})
+      execute_process(COMMAND make WORKING_DIRECTORY ${c-ares_SOURCE_DIR})
+      execute_process(COMMAND make --install WORKING_DIRECTORY ${c-ares_SOURCE_DIR})
+    endif()
+
+  endif()
 endmacro()
 
 # Set normal resolver
@@ -30,12 +48,28 @@ 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_DIR}/bin "dll")
+  copy_files_for_win(${C-ARES_DIR}/lib "lib")
+  copy_files_for_win(${C-ARES_DIR}/lib "dll")
 endmacro()
 
 # ######################################################################################################################
 message(STATUS "Setting c-ares: ${TRANTOR_USE_C-ARES}")
 
 if(TRANTOR_USE_C-ARES)
+  # Set C-ARES_DIR, to let find_package could search from it
+  if(WIN32)
+    set(C-ARES_DIR
+        c:/c-ares
+        CACHE PATH "Let find_package use the directory to find" FORCE
+    )
+  else()
+    set(C-ARES_DIR
+        ${CMAKE_INSTALL_PREFIX}/c-ares
+        CACHE PATH "Let find_package use the directory to find" FORCE
+    )
+  endif()
 
   find_package(c-ares)
 
@@ -44,7 +78,8 @@ if(TRANTOR_USE_C-ARES)
       message(STATUS "⚠️c-ares not found, Building it with FetchContent...")
       unset(c-ares_FOUND)
 
-      add_cares()
+      build_install_cares()
+      find_package(c-ares REQUIRED)
 
     else()
       message(FATAL_ERROR "⛔c-ares not found, please install it or set FETCH_BUILD_MISSING_DEPS to ON")

cmake/SetOpenssl.cmake

@@ -62,7 +62,7 @@ message(STATUS "Trantor using SSL library: openssl")
 # Set OPENSSL_ROOT_DIR, to let find_package could search from the build directory
 if(WIN32)
   set(OPENSSL_ROOT_DIR
-      ${CMAKE_INSTALL_PREFIX}/../OpenSSL
+      C:/OpenSSL
       CACHE PATH "Let find_package use the directory to find" FORCE
   )
 else()

cmake_modules/Findc-ares.cmake

@@ -12,12 +12,12 @@
 find_path(
   C-ARES_INCLUDE_DIRS
   NAMES ares.h
-  HINTS ${C-ARES_ROOT_DIR}/include
+  HINTS ${C-ARES_DIR}/include
 )
 find_library(
   C-ARES_LIBRARIES
   NAMES cares
-  HINTS ${C-ARES_ROOT_DIR}/lib
+  HINTS ${C-ARES_DIR}/lib
 )
 if(C-ARES_INCLUDE_DIRS AND C-ARES_LIBRARIES)
   if(NOT TARGET c-ares::cares)