diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-07 22:44:15 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-07 22:52:02 +0900 |
| commit | 4169fb7a822dfcd83b14bc550b4bd9d2ae9865b8 (patch) | |
| tree | 3d7086771748b0faed30b880e2a6753fcd7d64be | |
| parent | e0f80478bbf075099d96fe88e9dc44db626457e4 (diff) | |
| download | tdepowersave-4169fb7a822dfcd83b14bc550b4bd9d2ae9865b8.tar.gz tdepowersave-4169fb7a822dfcd83b14bc550b4bd9d2ae9865b8.zip | |
Updated to use new standalone tdehw library.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | ConfigureChecks.cmake | 17 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 961fd49..dcfe5fe 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -62,3 +62,20 @@ pkg_search_module( DBUS_TQT dbus-1-tqt ) if( NOT DBUS_TQT_FOUND ) tde_message_fatal( "dbus-1-tqt is required, but was not found on your system" ) endif( ) + + +# tdehwlib (drkonqi, kcontrol, kicker, ksmserver, tdeioslaves, tdm) +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/src/CMakeLists.txt b/src/CMakeLists.txt index c5071df..7e5fab2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,7 +37,6 @@ install( FILES config/tdepowersaverc_default RENAME tdepowersaverc DESTINATION $ ##### tdepowersave (tdeinit) ###################### - tde_add_tdeinit_executable( tdepowersave AUTOMOC SOURCES dummy.cpp autodimm.cpp autosuspend.cpp @@ -50,6 +49,6 @@ tde_add_tdeinit_executable( tdepowersave AUTOMOC tdepowersave.skel log_viewer.ui logviewer.cpp main.cpp screen.cpp settings.cpp suspenddialog.cpp suspend_Dialog.ui LINK - ${DBUS_TQT_LIBRARIES} tdeio-shared + ${DBUS_TQT_LIBRARIES} tdeio-shared ${TDEHW_LIBRARIES} ${XEXT_LIBRARIES} ${XTST_LIBRARIES} ${XSCRNSAVER_LIBRARIES} ) |