diff options
| author | Michele Calgaro <[email protected]> | 2021-05-07 23:05:00 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2021-05-07 23:05:00 +0900 |
| commit | 0cd5a14b602df025222d0956bd346dd719bcba55 (patch) | |
| tree | 832d606c12cacf467d31345295c7160ad8558829 | |
| parent | bade7111d11154a05deac0ae94a51b7746a9b76f (diff) | |
| download | tdenetworkmanager-0cd5a14b602df025222d0956bd346dd719bcba55.tar.gz tdenetworkmanager-0cd5a14b602df025222d0956bd346dd719bcba55.zip | |
Updated to use new standalone tdehw library.
Signed-off-by: Michele Calgaro <[email protected]>
| -rw-r--r-- | ConfigureChecks.cmake | 17 | ||||
| -rw-r--r-- | tdenetworkmanager/src/CMakeLists.txt | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f3dfb85..caccbd0 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -27,3 +27,20 @@ tde_setup_largefiles( ) if( WITH_GCC_VISIBILITY ) tde_setup_gcc_visibility( ) endif( WITH_GCC_VISIBILITY ) + + +# check for tdehwlib +tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" ) +check_cxx_source_compiles( " + #include <kdemacros.h> + #ifndef __TDE_HAVE_TDEHWLIB + #error tdecore is not build with tdehwlib + #endif + int main() { return 0; } " + HAVE_TDEHWLIB +) +tde_restore( CMAKE_REQUIRED_INCLUDES ) +if( NOT HAVE_TDEHWLIB ) + tde_message_fatal( "tdehwlib is required, but not built in tdecore" ) +endif( NOT HAVE_TDEHWLIB ) +set( TDEHW_LIBRARIES "tdehw-shared" ) diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt index 94b6a73..3533be4 100644 --- a/tdenetworkmanager/src/CMakeLists.txt +++ b/tdenetworkmanager/src/CMakeLists.txt @@ -77,5 +77,6 @@ tde_add_tdeinit_executable( tdenetworkmanager AUTOMOC tdenetman-vpnauthenticationdialog.cpp vpn_tray_component.cpp EMBED tdenetwork-connection-configwidgets-static #tdenetwork-connection-settings-static - LINK tdecore-shared tdeui-shared tdeutils-shared ${DBUS_TQT_LIBRARIES} + LINK tdecore-shared tdeui-shared tdeutils-shared ${TDEHW_LIBRARIES} ${DBUS_TQT_LIBRARIES} + ) |