Skip to content

Commit e88aef9

Browse files
Merge branch 'mongo-upd' of github.com:treefrogframework/treefrog-framework into mongo-upd
2 parents 2f5608d + 1b4afa1 commit e88aef9

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ jobs:
229229
- name: Homebrew
230230
run: |
231231
which pkg-config || brew install pkg-config
232-
brew install qt6 jq mongo-c-driver@1 gflags glog lz4 yarn
232+
brew install qt6 jq mongo-c-driver@2 gflags glog lz4 yarn
233233
- name: configure for debug
234234
run: |
235235
export PKG_CONFIG_PATH=$(echo "$(find -L "$(brew --prefix)/opt" -type d \( -path "*/lib/pkgconfig" -o -path "*/share/pkgconfig" \) 2>/dev/null)" | sort -u | paste -sd ":" -):$PKG_CONFIG_PATH

src/corelib.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,8 @@ unix {
464464
LIBS += ../3rdparty/mongo-driver/src/libmongoc/libmongoc2.a ../3rdparty/mongo-driver/src/libbson/libbson2.a
465465
} else {
466466
# Shared link
467+
LIBS += $$system("pkg-config --libs mongoc2 2>/dev/null")
468+
QMAKE_CXXFLAGS += $$system("pkg-config --cflags-only-I mongoc2 2>/dev/null")
467469
LIBS += $$system("pkg-config --libs libmongoc-1.0 2>/dev/null")
468470
QMAKE_CXXFLAGS += $$system("pkg-config --cflags-only-I libmongoc-1.0 2>/dev/null")
469471
LIBS += $$system("pkg-config --libs openblas 2>/dev/null")

0 commit comments

Comments
 (0)