From 3858e0f7177b0d498435e509765136c7f90f125b Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Thu, 21 Nov 2019 13:59:41 +0100
Subject: [PATCH] switch to mongo-c 1.15
---
3d_party/mongo-c-driver/install.cmd | 4 ++--
3d_party/mongo-c-driver/install.sh | 9 +++++----
common/cpp/src/database/CMakeLists.txt | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/3d_party/mongo-c-driver/install.cmd b/3d_party/mongo-c-driver/install.cmd
index 1aef67559..08a32ed8b 100644
--- a/3d_party/mongo-c-driver/install.cmd
+++ b/3d_party/mongo-c-driver/install.cmd
@@ -1,8 +1,8 @@
:: download and untar mongoc driver sources to dir
-:: https://github.com/mongodb/mongo-c-driver/releases/download/1.9.0/mongo-c-driver-1.9.0.tar.gz
+:: https://github.com/mongodb/mongo-c-driver/releases/download/1.15.2/mongo-c-driver-1.15.2.tar.gz
:: set directory with mongoc driver sources
-SET dir=c:\tmp\mongo-c-driver-1.9.0
+SET dir=c:\tmp\mongo-c-driver-1.15.2
set mypath=%cd%
cd /d %dir%
diff --git a/3d_party/mongo-c-driver/install.sh b/3d_party/mongo-c-driver/install.sh
index 33d1d5d8a..eba4e08f6 100755
--- a/3d_party/mongo-c-driver/install.sh
+++ b/3d_party/mongo-c-driver/install.sh
@@ -1,10 +1,11 @@
#!/usr/bin/env bash
cd $1
-wget https://github.com/mongodb/mongo-c-driver/releases/download/1.9.0/mongo-c-driver-1.9.0.tar.gz
-tar xzf mongo-c-driver-1.9.0.tar.gz
-cd mongo-c-driver-1.9.0
-./configure --disable-automatic-init-and-cleanup --enable-static=yes --enable-shared=no --enable-examples=no --enable-ssl=no --enable-sasl=no
+wget https://github.com/mongodb/mongo-c-driver/releases/download/1.15.2/mongo-c-driver-1.15.2.tar.gz
+tar xzf mongo-c-driver-1.15.2.tar.gz
+cd mongo-c-driver-1.15.2
+
+cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_SSL=OFF -DENABLE_SASL=OFF -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DMONGOC_ENABLE_STATIC=ON .
make
#sudo make install
diff --git a/common/cpp/src/database/CMakeLists.txt b/common/cpp/src/database/CMakeLists.txt
index 30ebedb96..261134f12 100644
--- a/common/cpp/src/database/CMakeLists.txt
+++ b/common/cpp/src/database/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES
################################
# Library
################################
-find_package (libmongoc-static-1.0 1.9 REQUIRED)
+find_package (libmongoc-static-1.0 1.15 REQUIRED)
message ("-- mongoc found version \"${MONGOC_STATIC_VERSION}\"")
message ("-- mongoc include path \"${MONGOC_STATIC_INCLUDE_DIRS}\"")
message ("-- mongoc libraries \"${MONGOC_STATIC_LIBRARIES}\"")
--
GitLab