[Orxonox-commit 5162] r9827 - in code/branches/wiimote: cmake cmake/tools src/external/wiicpp/wiic
smerkli at orxonox.net
smerkli at orxonox.net
Mon Nov 25 17:27:24 CET 2013
Author: smerkli
Date: 2013-11-25 17:27:23 +0100 (Mon, 25 Nov 2013)
New Revision: 9827
Modified:
code/branches/wiimote/cmake/LibraryConfig.cmake
code/branches/wiimote/cmake/LibraryConfigTardis.cmake
code/branches/wiimote/cmake/tools/FindBluetooth.cmake
code/branches/wiimote/src/external/wiicpp/wiic/io.h
code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c
code/branches/wiimote/src/external/wiicpp/wiic/wiic.h
code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h
Log:
Tried a few fixes to get Bluetooth to be included
properly, but no success so far. Will have to ask someone
who knows more about our CMake setup for this.
Modified: code/branches/wiimote/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/wiimote/cmake/LibraryConfig.cmake 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/cmake/LibraryConfig.cmake 2013-11-25 16:27:23 UTC (rev 9827)
@@ -204,7 +204,7 @@
ENDIF()
ENDIF(WIN32)
-LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
+#LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
################# OGRE Plugins ##################
# Check the plugins and determine the plugin folder
Modified: code/branches/wiimote/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/branches/wiimote/cmake/LibraryConfigTardis.cmake 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/cmake/LibraryConfigTardis.cmake 2013-11-25 16:27:23 UTC (rev 9827)
@@ -83,9 +83,6 @@
#SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
- LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC/")
-
-
# Sandro fix: add flag that re-enables boost threads. This makes the combination
# of GCC version > 4.7 and older libboost work. See
# http://stackoverflow.com/questions/5389853/doesnt-compile-if-included-boost-thread-in-linux-ubuntu10-10
Modified: code/branches/wiimote/cmake/tools/FindBluetooth.cmake
===================================================================
--- code/branches/wiimote/cmake/tools/FindBluetooth.cmake 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/cmake/tools/FindBluetooth.cmake 2013-11-25 16:27:23 UTC (rev 9827)
@@ -1,9 +1,10 @@
IF(LINUX)
- MESSAGE(STATUS 'sewpertest')
- FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth.h /usr/include/bluetooth/ /usr/local/include/bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
- FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS /usr/lib/ /usr/lib/x86_64-linux-gnu /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu)
- MESSAGE(STATUS "sewpertest 2 ${BLUETOOTH_LIBRARY}")
- MESSAGE(STATUS "sewpertest 3 ${BLUETOOTH_INCLUDE_DIR}")
+ #FIND_PATH(BLUETOOTH_INCLUDE_DIR NAMES bluetooth PATHS /usr/include/bluetooth/ /usr/local/include/bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
+ #FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS /usr/lib/ /usr/lib/x86_64-linux-gnu /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu)
+ FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/)
+ FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu/)
+ MESSAGE(STATUS "Bluetooth library test: ${BLUETOOTH_LIBRARY}")
+ MESSAGE(STATUS "Bluetooth header test: ${BLUETOOTH_INCLUDE_DIR}")
IF(BLUETOOTH_INCLUDE_DIR AND BLUETOOTH_LIBRARY)
SET(BLUETOOTH_FOUND TRUE)
ENDIF(BLUETOOTH_INCLUDE_DIR AND BLUETOOTH_LIBRARY)
Modified: code/branches/wiimote/src/external/wiicpp/wiic/io.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/io.h 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/src/external/wiicpp/wiic/io.h 2013-11-25 16:27:23 UTC (rev 9827)
@@ -37,10 +37,11 @@
#ifndef CONNECT_H_INCLUDED
#define CONNECT_H_INCLUDED
-#ifdef LINUX
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
-#include "/usr/include/bluetooth/bluetooth.h"
-#endif
+/* This is not required, wiic_internal already includes bluetooth. */
+//#ifdef LINUX
+////#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+ //#include <bluetooth.h>
+//#endif
#include "wiic_internal.h"
Modified: code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c 2013-11-25 16:27:23 UTC (rev 9827)
@@ -40,14 +40,18 @@
#include <stdlib.h>
#include <unistd.h>
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci.h"
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci_lib.h"
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/l2cap.h"
-#include "/usr/include/bluetooth/bluetooth.h"
-#include "/usr/include/bluetooth/hci.h"
-#include "/usr/include/bluetooth/hci_lib.h"
-#include "/usr/include/bluetooth/l2cap.h"
+/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
+ * back here and fix this very ugly inclusion as soon as I get to grips with
+ * cmake.
+ */
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci.h"
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci_lib.h"
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/l2cap.h"
+//#include "/usr/include/bluetooth/bluetooth.h"
+//#include "/usr/include/bluetooth/hci.h"
+//#include "/usr/include/bluetooth/hci_lib.h"
+//#include "/usr/include/bluetooth/l2cap.h"
#include "definitions.h"
#include "wiic_internal.h"
Modified: code/branches/wiimote/src/external/wiicpp/wiic/wiic.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/wiic.h 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/src/external/wiicpp/wiic/wiic.h 2013-11-25 16:27:23 UTC (rev 9827)
@@ -47,8 +47,13 @@
#include <IOBluetooth/IOBluetoothUserLib.h>
#else
/* nix */
- //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
- #include "/usr/include/bluetooth/bluetooth.h"
+/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
+ * back here and fix this very ugly inclusion as soon as I get to grips with
+ * cmake.
+ */
+// #include "bluetooth/bluetooth.h"
+// #include <bluetooth.h>
+ #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
#endif
#ifdef WIIC_INTERNAL_H_INCLUDED
Modified: code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h 2013-11-25 15:43:47 UTC (rev 9826)
+++ code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h 2013-11-25 16:27:23 UTC (rev 9827)
@@ -49,8 +49,13 @@
#ifndef __APPLE__
#include <arpa/inet.h> /* htons() */
-// #include <bluetooth.h>
- #include "/usr/include/bluetooth/bluetooth.h"
+/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
+ * back here and fix this very ugly inclusion as soon as I get to grips with
+ * cmake.
+ */
+// #include <bluetooth.h>
+// #include "bluetooth/bluetooth.h"
+ #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
#endif
#include "definitions.h"
More information about the Orxonox-commit
mailing list