debug some more macos

vaintroub · Sep 10, 2023 · d4da28e · d4da28e
1 parent 3772984
commit d4da28e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/cmake-single-os.yml b/.github/workflows/cmake-single-os.yml
@@ -31,7 +31,7 @@ jobs:
  run : |
  HOMEBREW_NO_AUTO_UPDATE=1 brew install mysql-client libpq ninja
  brew link --force mysql-client
- brew link --force --overwrite libpq
+ #brew link --force --overwrite libpq
 
  - name: install build prerequisites (Windows)
  if: runner.os == 'Windows'
@@ -99,7 +99,7 @@ jobs:
  run : |
  HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja mysql-client libpq
  brew link --force mysql-client
- brew link --force --overwrite libpq
+ #brew link --force --overwrite libpq
 
  - name: install ninja (Linux)
  if: runner.os == 'Linux'
@@ -212,7 +212,7 @@ jobs:
  run : |
  HOMEBREW_NO_AUTO_UPDATE=1 brew install mysql-client libpq
  brew link --force mysql-client
- brew link --force --overwrite libpq
+ # brew link --force --overwrite libpq
 
  - name: update environment (Windows)
  if: runner.os == 'Windows'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,7 @@ if(APPLE)
  foreach(pkg openssl mysql-client mariadb-connector-c libpq)
  set(pkgpath /usr/local/opt/${pkg})
  if(EXISTS ${pkgpath})
+ message(STATUS "Adding /usr/local/opt/${pkg} to CMAKE_PREFIX_PATH")
  list(APPEND CMAKE_PREFIX_PATH ${pkg})
  endif()
  endforeach()