cmake: Move test for stdint.h to common tests

Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 182234c826)
8 years ago · 0feb22c61f
parent a86cb078cb
commit 0feb22c61f
4 changed files with 7 additions and 3 deletions
--- 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 )
--- 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
--- 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()


--- 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 )