Changeset 344

Show
Ignore:
Timestamp:
05/21/08 13:13:25 (5 months ago)
Author:
hsattler
Message:

fix bluetooth detection on Linux with no pkg-config installed

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/CMakeModules/FindBluetooth.cmake

    r339 r344  
    2727      mark_as_advanced ( ${i}_LIBRARY ) 
    2828    endforeach ( i ) 
    29     set ( Bluetooth_LIBRARIES "${Bluetooth_LIBRARIES}" CACHE STRING "" ) 
    30     mark_as_advanced ( Bluetooth_LIBRARIES ) 
    3129    add_definitions ( -DHAVE_SDPLIB ) 
    3230  else ( PKGCONFIG_BLUEZ_FOUND ) 
    … …  
    3937    mark_as_advanced ( Bluetooth_INCLUDE_DIRS ) 
    4038 
    41     find_library ( OpenObex_LIBRARY 
     39    find_library ( bluetooth_LIBRARY 
    4240      NAMES 
    4341        bluetooth 
    … …  
    4543        lib 
    4644    ) 
    47     set ( Bluetooth_LIBRARIES ${Bluetooth_LIBRARY} CACHE STRING "") 
    48     mark_as_advanced ( Bluetooth_LIBRARY Bluetooth_LIBRARIES ) 
     45    set ( Bluetooth_LIBRARIES ${bluetooth_LIBRARY} ) 
     46    mark_as_advanced ( bluetooth_LIBRARY ) 
    4947 
    5048    if ( Bluetooth_INCLUDE_DIRS AND Bluetooth_LIBRARIES )