diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2025-08-17 19:31:08 +0300 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2025-08-21 13:03:19 +0300 |
| commit | 61f8e96f314713b81c63949a067184d1c38ce480 (patch) | |
| tree | aa029da473346bfaefe4cf1f59b86e9009c70d9a | |
| parent | 719f290d5eeb63d0d0424eb4733dde89b23dfd7c (diff) | |
| download | tdenetwork-61f8e96f.tar.gz tdenetwork-61f8e96f.zip | |
kopete/sms: move INCLUDE_SMSGSM to the root config
This fixes INCLUDE_SMSGSM's #ifdef`s in
kopete/protocols/sms/serviceloader.cpp which were ignored before.
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit b15319ca4f4d4cc232b72dd16390d5c3d8ac2620)
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | kopete/protocols/sms/services/ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | kopete/protocols/sms/services/config.h.cmake | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config.h.cmake b/config.h.cmake index cdda60ff..8247d6e2 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -33,6 +33,9 @@ // kopete/plugins/nowlistening #cmakedefine HAVE_XMMS 1 +// kopete/protocols/sms +#cmakedefine INCLUDE_SMSGSM 1 + // kopete/plugins/webpresence #cmakedefine HAVE_XSLT 1 diff --git a/kopete/protocols/sms/services/ConfigureChecks.cmake b/kopete/protocols/sms/services/ConfigureChecks.cmake index 4ed454b4..71f85d45 100644 --- a/kopete/protocols/sms/services/ConfigureChecks.cmake +++ b/kopete/protocols/sms/services/ConfigureChecks.cmake @@ -17,7 +17,7 @@ if( WITH_GSM ) tde_restore( CMAKE_REQUIRED_INCLUDES ) if( HAVE_GSMLIB_GSM_UTIL_H ) - set( INCLUDE_SMSGSM 1 ) + set( INCLUDE_SMSGSM 1 CACHE INTERNAL "" FORCE ) find_library( GSM_LIBRARY gsmme ) endif( ) @@ -26,5 +26,3 @@ if( WITH_GSM ) endif( ) endif( ) - -configure_file( config.h.cmake config.h @ONLY ) diff --git a/kopete/protocols/sms/services/config.h.cmake b/kopete/protocols/sms/services/config.h.cmake deleted file mode 100644 index 9555d535..00000000 --- a/kopete/protocols/sms/services/config.h.cmake +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine INCLUDE_SMSGSM 1 |