[PATCH] Enable BT compilation earlier

Miika Turkia miika.turkia at gmail.com
Sun Nov 8 00:40:24 PST 2015


Commit ba55c603953bb530de2fe97fa46098d8c87e6aa5 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 at gmail.com>
---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d45ca43..9fa1b45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,10 @@ option(FTDISUPPORT "enable support for libftdi based serial" OFF)
 
 add_definitions(-DSUBSURFACE_SOURCE="${CMAKE_SOURCE_DIR}")
 
+if(BTSUPPORT)
+	add_definitions(-DBT_SUPPORT)
+endif()
+
 set(CMAKE_MODULE_PATH
 	${CMAKE_MODULE_PATH}
 	${${PROJECT_NAME}_SOURCE_DIR}/cmake/Modules
@@ -330,10 +334,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?)
-- 
2.5.0



More information about the subsurface mailing list