diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-09-22 17:12:00 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-09-22 17:12:00 -0700 |
| commit | 131c5a2abe151493b23b42469834aa5c9891459b (patch) | |
| tree | e079916289d2b5cfb1d09bad1f51175df7d7cbbb | |
| parent | 78dc3a3efe83c66a7cb31677704e1570bf8a3a4a (diff) | |
| download | subsurface-131c5a2abe151493b23b42469834aa5c9891459b.tar.gz | |
Fix building of Facebook support
No idea when this got broken. Fix seems like a hack as that variable
should get set in the plugin CMakeLists.txt. But it seems to work, so
"whatever".
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | desktop-widgets/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 095160c7d..09afcf882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,6 +267,9 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") target_link_libraries(smtk2ssrf smtk_import) endif() + if(FBSUPPORT) + set(FACEBOOK_INTEGRATION facebook_integration) + endif() target_link_libraries( ${SUBSURFACE_TARGET} subsurface_generated_ui diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt index dc5503515..0e7601196 100644 --- a/desktop-widgets/CMakeLists.txt +++ b/desktop-widgets/CMakeLists.txt @@ -7,6 +7,11 @@ if(BTSUPPORT) set(BT_SRC_FILES btdeviceselectiondialog.cpp) endif() +if (FBSUPPORT) + add_definitions(-DFBSUPPORT) +endif() + + include_directories(. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 78faaadc5..33151efb8 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -59,8 +59,6 @@ #if defined(FBSUPPORT) #include "plugins/facebook/facebook_integration.h" - -#include "socialnetworks.h" #endif QProgressDialog *progressDialog = NULL; |