mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix CMake to not add Facebook on Android

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-12-17 17:14:13 -02:00 • committed by Dirk Hohndel
parent 8abbcc5598
commit 13573915b6
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -129,7 +129,6 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
endif() endif()
if(ANDROID) if(ANDROID)
set(FBSUPPORT OFF)
set(NO_PRINTING ON) set(NO_PRINTING ON)
list(APPEND QT_EXTRA_COMPONENTS AndroidExtras) list(APPEND QT_EXTRA_COMPONENTS AndroidExtras)
list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras) list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras)
@ -208,11 +207,6 @@ if (${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
add_subdirectory(desktop-widgets) add_subdirectory(desktop-widgets)
endif() endif()
if(FBSUPPORT)
add_definitions(-DFBSUPPORT)
set(FACEBOOK_INTEGRATION facebook_integration)
endif()
# create the executables # create the executables
if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
set(SUBSURFACE_TARGET subsurface-mobile) set(SUBSURFACE_TARGET subsurface-mobile)

33
desktop-widgets/plugins/facebook/CMakeLists.txt
View file

@ -1,17 +1,22 @@
if (ANDROID)
set(FACEBOOK_INTEGRATION "")
elseif (${FBSUPPORT})
add_definitions(-DFBSUPPORT)
set(FACEBOOK_INTEGRATION facebook_integration)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(FACEBOOK_PLUGIN_UI
facebookconnectwidget.ui
socialnetworksdialog.ui
)
set(FACEBOOK_PLUGIN_UI set(FACEBOOK_PLUGIN_SRCS
facebookconnectwidget.ui facebook_integration.cpp
socialnetworksdialog.ui facebookconnectwidget.cpp
) )
set(FACEBOOK_PLUGIN_SRCS qt5_wrap_ui(FACEBOOK_PLUGIN_UI_SRCS ${FACEBOOK_PLUGIN_UI})
facebook_integration.cpp add_library(facebook_integration STATIC ${FACEBOOK_PLUGIN_SRCS} ${FACEBOOK_PLUGIN_UI_SRCS})
facebookconnectwidget.cpp target_link_libraries(facebook_integration ${QT_LIBRARIES})
) add_dependencies(facebook_integration subsurface_corelib)
endif()
qt5_wrap_ui(FACEBOOK_PLUGIN_UI_SRCS ${FACEBOOK_PLUGIN_UI})
add_library(facebook_integration STATIC ${FACEBOOK_PLUGIN_SRCS} ${FACEBOOK_PLUGIN_UI_SRCS})
target_link_libraries(facebook_integration ${QT_LIBRARIES})
add_dependencies(facebook_integration subsurface_corelib)