diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-26 13:56:01 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-26 14:03:50 +0200 |
commit | a2b383477a4fcbfdf8d1372ac9009692d48dfc76 (patch) | |
tree | 7fc322b6c062dbcaf9ec03c6e1565c91140dec89 /wifi | |
parent | e0fdfd9d543dfac30f45441046ac8b0144c20ab8 (diff) | |
download | tdenetwork-a2b383477a4fcbfdf8d1372ac9009692d48dfc76.tar.gz tdenetwork-a2b383477a4fcbfdf8d1372ac9009692d48dfc76.zip |
Fix various cmake build issues
(cherry picked from commit 93dc872306fb4daa2eda10382fff841fd6b9bcdc)
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/ConfigureChecks.cmake | 2 | ||||
-rw-r--r-- | wifi/kwireless/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/wifi/ConfigureChecks.cmake b/wifi/ConfigureChecks.cmake index f3a7ddb2..0d2972b1 100644 --- a/wifi/ConfigureChecks.cmake +++ b/wifi/ConfigureChecks.cmake @@ -21,7 +21,9 @@ endif( ) # check for wireless tools +tde_save_and_set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-lm" ) check_library_exists( iw iw_get_stats "" HAVE_IW ) +tde_restore( CMAKE_REQUIRED_FLAGS ) if( HAVE_IW ) check_include_file( iwlib.h HAVE_IWLIB_H ) # we need at least wireless tools >= 27 diff --git a/wifi/kwireless/CMakeLists.txt b/wifi/kwireless/CMakeLists.txt index 5acfb5ae..3707722c 100644 --- a/wifi/kwireless/CMakeLists.txt +++ b/wifi/kwireless/CMakeLists.txt @@ -33,5 +33,5 @@ tde_add_kpart( libkwireless AUTOMOC kwireless.cpp kwirelesswidget.cpp linuxwirelesswidget.cpp propertytablebase.ui propertytable.cpp LINK kdeui-shared ${IW_LIBRARY} - DESTINATION ${PLUGIN_INSTALL_DIR} + DESTINATION ${LIB_INSTALL_DIR} ) |