mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable BT compilation earlier

Browse source 
Commit ba55c60395 broke Bluetooth
support for me. This patch moves the setting of BT_SUPPORT earlier,
re-enabling BT download option on the download dialog.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-11-08 20:08:41 +02:00 committed by Dirk Hohndel
parent 003ddc6b52
commit 77d7e773b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -221,6 +221,10 @@ if (BTSUPPORT AND "${Qt5Core_VERSION_STRING}" STRLESS "5.4.0")
list(REMOVE_ITEM QT_LIBRARIES Qt5::Bluetooth)
endif()
if(BTSUPPORT)
add_definitions(-DBT_SUPPORT)
endif()
# Generate the ssrf-config.h every 'make'
file(WRITE ${CMAKE_BINARY_DIR}/version.h.in
"#define VERSION_STRING \"@VERSION_STRING@\"
@ -328,10 +332,6 @@ if(FBSUPPORT)
add_definitions(-DFBSUPPORT)
endif()
if(BTSUPPORT)
add_definitions(-DBT_SUPPORT)
endif()
# add pthread to the end of the library list on Linux
# this is only needed on Ubuntu (why do these idiots break everything?)