From: Dave Cramer <davecramer@gmail.com>
Date: Mon, 13 May 2024 11:14:32 +0000 (-0400)
Subject: Merge branch 'main' of github.com:postgresql-interfaces/psqlodbc
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=45b8dd1ba268c0b046528d201751fc07cbf8025f;p=psqlodbc.git

Merge branch 'main' of github.com:postgresql-interfaces/psqlodbc
---

45b8dd1ba268c0b046528d201751fc07cbf8025f
diff --cc .github/workflows/main.yml
index 699050d,77b59f8..3e9bef1
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -203,8 -222,9 +222,9 @@@ jobs
          arch: x64
      - name : 'build postgres x64'
        if: ${{steps.cachePostgres.outputs.cache-hit != 'true'}}
+       working-directory: postgresql
        run: |
 -        meson setup build --prefix=d:\postgresql
 +        meson setup build -Dssl=openssl -Dextra_lib_dirs=c:\openssl64\lib\VC\x64\MT -Dextra_include_dirs=c:\openssl64\include --prefix=d:\postgresql
          cd build
          ninja
          ninja install