Changeset 9827 for code/branches/wiimote/cmake

Timestamp:

Nov 25, 2013, 5:27:23 PM (11 years ago)

Author:

smerkli

Message:

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.

Location:

code/branches/wiimote/cmake

Files:

• LibraryConfig.cmake (modified) (1 diff)
• LibraryConfigTardis.cmake (modified) (1 diff)
• tools/FindBluetooth.cmake (modified) (1 diff)

code/branches/wiimote/cmake/LibraryConfig.cmake

@@ -205 +205 @@
 ENDIF(WIN32)
 
-LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
+#LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
 ################# OGRE Plugins ##################
 

code/branches/wiimote/cmake/LibraryConfigTardis.cmake

@@ -84 +84 @@
 
 
-  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 

code/branches/wiimote/cmake/tools/FindBluetooth.cmake

@@ -1 +1 @@
 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)