From 0cd5a14b602df025222d0956bd346dd719bcba55 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 May 2021 23:05:00 +0900 Subject: [PATCH] Updated to use new standalone tdehw library. Signed-off-by: Michele Calgaro --- ConfigureChecks.cmake | 17 +++++++++++++++++ tdenetworkmanager/src/CMakeLists.txt | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) 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 + #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} + )