From 182234c826322c90bed4e02bd0846372b83c245f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 4 Dec 2016 19:14:57 +0100 Subject: cmake: Move test for stdint.h to common tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ConfigureChecks.cmake | 4 ++++ config.h.cmake | 3 +++ kopete/protocols/yahoo/libkyahoo/CMakeLists.txt | 2 -- kopete/protocols/yahoo/libkyahoo/ConfigureChecks.cmake | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d78e05db..8579d7a1 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -32,6 +32,10 @@ if( BUILD_KOPETE OR BUILD_KPPP ) check_include_file( string.h HAVE_STRING_H ) endif( ) +if( BUILD_KOPETE OR BUILD_KTALKD ) + check_include_file( stdint.h HAVE_STDINT_H ) +endif( ) + if( WITH_SLP ) check_library_exists( slp "SLPOpen" "" HAVE_SLP ) if( HAVE_SLP ) diff --git a/config.h.cmake b/config.h.cmake index 3f33b830..4006c692 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -15,6 +15,9 @@ // kopete/protocols/yahoo, kppp #cmakedefine HAVE_STRING_H 1 +// kopete, ktalkd +#cmakedefine HAVE_STDINT_H 1 + // kopete/protocols/jabber #cmakedefine SUPPORT_JINGLE 1 #cmakedefine HAVE_GLIB 1 diff --git a/kopete/protocols/yahoo/libkyahoo/CMakeLists.txt b/kopete/protocols/yahoo/libkyahoo/CMakeLists.txt index a4ba8ba0..131ca394 100644 --- a/kopete/protocols/yahoo/libkyahoo/CMakeLists.txt +++ b/kopete/protocols/yahoo/libkyahoo/CMakeLists.txt @@ -13,8 +13,6 @@ include( ConfigureChecks.cmake ) if( HAVE_INTTYPES_H ) add_definitions( -DHAVE_INTTYPES_H ) -elseif( HAVE_STDINT_H ) - add_definitions( -DHAVE_STDINT_H ) endif() diff --git a/kopete/protocols/yahoo/libkyahoo/ConfigureChecks.cmake b/kopete/protocols/yahoo/libkyahoo/ConfigureChecks.cmake index a2a2fe60..4e4e8a25 100644 --- a/kopete/protocols/yahoo/libkyahoo/ConfigureChecks.cmake +++ b/kopete/protocols/yahoo/libkyahoo/ConfigureChecks.cmake @@ -10,6 +10,5 @@ ################################################# check_include_file( inttypes.h HAVE_INTTYPES_H ) -check_include_file( stdint.h HAVE_STDINT_H ) check_include_file( strings.h HAVE_STRINGS_H ) -- cgit v1.2.1