xxx

kou · Jun 27, 2023 · 485a32e · 485a32e
1 parent 4cfe9fa
commit 485a32e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -188,6 +188,7 @@ jobs:
           rm -f /usr/local/bin/python3-config || :
           brew update --preinstall
           brew bundle --file=cpp/Brewfile
+          ls -lah /usr/local/include
       - name: Install MinIO
         run: |
           $(brew --prefix bash)/bin/bash \

diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh
@@ -171,7 +171,7 @@ cmake \
   ${source_dir}
 
 export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$[${n_jobs} + 1]}
-time cmake --build . --target install
+time cmake --build . --target install --verbose
 
 popd
 

diff --git a/cpp/Brewfile b/cpp/Brewfile
@@ -30,7 +30,7 @@ brew "grpc"
 brew "llvm@14"
 brew "lz4"
 brew "ninja"
-brew "openssl@1.1"
+brew "openssl@3"
 brew "protobuf"
 brew "python"
 brew "rapidjson"

diff --git a/cpp/cmake_modules/FindOpenSSLAlt.cmake b/cpp/cmake_modules/FindOpenSSLAlt.cmake
@@ -22,17 +22,24 @@ endif()
 if(APPLE AND NOT OPENSSL_ROOT_DIR)
   find_program(BREW brew)
   if(BREW)
-    execute_process(COMMAND ${BREW} --prefix "openssl@1.1"
-                    OUTPUT_VARIABLE OPENSSL11_BREW_PREFIX
+    execute_process(COMMAND ${BREW} --prefix "openssl"
+                    OUTPUT_VARIABLE OPENSSL_BREW_PREFIX
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(OPENSSL11_BREW_PREFIX)
-      set(OPENSSL_ROOT_DIR ${OPENSSL11_BREW_PREFIX})
+    if(OPENSSL_BREW_PREFIX)
+      set(OPENSSL_ROOT_DIR ${OPENSSL_BREW_PREFIX})
     else()
-      execute_process(COMMAND ${BREW} --prefix "openssl"
-                      OUTPUT_VARIABLE OPENSSL_BREW_PREFIX
+      execute_process(COMMAND ${BREW} --prefix "openssl@3.0"
+                      OUTPUT_VARIABLE OPENSSL3_BREW_PREFIX
                       OUTPUT_STRIP_TRAILING_WHITESPACE)
-      if(OPENSSL_BREW_PREFIX)
-        set(OPENSSL_ROOT_DIR ${OPENSSL_BREW_PREFIX})
+      if(OPENSSL11_BREW_PREFIX)
+        set(OPENSSL_ROOT_DIR ${OPENSSL3_BREW_PREFIX})
+      else()
+        execute_process(COMMAND ${BREW} --prefix "openssl@1.1"
+                        OUTPUT_VARIABLE OPENSSL11_BREW_PREFIX
+                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(OPENSSL11_BREW_PREFIX)
+          set(OPENSSL_ROOT_DIR ${OPENSSL11_BREW_PREFIX})
+        endif()
       endif()
     endif()
   endif()