diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-06-01 09:58:09 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-06-01 09:58:09 -0700 |
| commit | 0c2457d9dcb990e906d8e4fa4cbe557546bf8eb9 (patch) | |
| tree | b34230a99787f8a2271a2fce3cfa720048d9fe95 | |
| parent | e84d8624bb1790ae46d3c7a7b642effb9090b65d (diff) | |
| download | subsurface-0c2457d9dcb990e906d8e4fa4cbe557546bf8eb9.tar.gz | |
Cloud storage: only make this available with new enough libgit2
The credential callback doesn't appear to work (at least not the way I
implemented it) with v0.22 and earlier.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bc4a4a21b..93d5262d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ if(LIBGIT2_FROM_PKGCONFIG) set(LIBGIT2_LIBRARIES "") if(USE_LIBGIT23_API) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API") pkg_config_library(LIBSSH2 libssh2 REQUIRED) set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) endif() @@ -52,6 +53,7 @@ else() include_directories(${LIBGIT2_INCLUDE_DIR}) if(USE_LIBGIT23_API) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API") set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -lssh2) endif() endif() diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index b039af9bb..8630cfbb8 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -148,6 +148,11 @@ MainWindow::MainWindow() : QMainWindow(), plannerDetails->printPlan()->hide(); ui.menuFile->removeAction(ui.actionPrint); #endif +#ifndef USE_LIBGIT23_API + ui.menuFile->removeAction(ui.actionCloudstorageopen); + ui.menuFile->removeAction(ui.actionCloudstoragesave); + qDebug() << "disabled / made invisible the cloud storage stuff"; +#endif ui.mainErrorMessage->hide(); graphics()->setEmptyState(); |