Changeset 9812 for code/branches/wiimote/cmake

Timestamp:

Nov 25, 2013, 3:33:02 PM (11 years ago)

Author:

georgr

Message:

Committing a few local changes, this won't work very well on non-georg boxes. @smerkli: Fix 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")
 ################# 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 /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
-        FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS /usr/lib/x86_64-linux-gnu /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu) 
+        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}")