generic: merge kdefakes into kdecore

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

cmake/modules/FindKDE4Internal.cmake

@@ -408,7 +408,6 @@ set(_kde_libraries
     kdcraw
     kdeclarative
     kdecore
-    kdefakes
     kdesu
     kdeui
     kdewebkit

kdecore/CMakeLists.txt

@@ -133,23 +133,6 @@ add_subdirectory(network/kssld)
 
 ########### next target ###############
 
-add_library(kdefakes ${LIBRARY_TYPE} fakes.c)
-set_target_properties(kdefakes PROPERTIES
-    VERSION ${KDE_NON_GENERIC_LIB_VERSION}
-    SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
-)
-if(NOT HAVE_TRUNC)
-    target_link_libraries(kdefakes  m )
-endif()
-
-install(
-    TARGETS kdefakes
-    EXPORT kdelibsLibraryTargets
-    ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-########### next target ###############
-
 set(kdecore_LIB_SRCS
     compression/kgzipfilter.cpp
     compression/kfilterbase.cpp
@@ -295,7 +278,7 @@ set(kdecore_LIB_SRCS
     util/kshell_unix.cpp
     util/kuser_unix.cpp
     util/kmacroexpander_unix.cpp
-    fakes.c
+    fakes.cpp
 
     ${kdecore_OPTIONAL_SRCS}
     ${KAUTH_BACKEND_SRCS}
@@ -322,6 +305,10 @@ if(FAM_FOUND)
    target_link_libraries(kdecore PRIVATE ${FAM_LIBRARIES})
 endif(FAM_FOUND)
 
+if(NOT HAVE_TRUNC)
+    target_link_libraries(kdecore PRIVATE m)
+endif()
+
 target_link_libraries(kdecore PUBLIC
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTCORE_LIBRARY}
@@ -379,9 +366,6 @@ target_link_libraries(kde4-config ${KDE4_KDECORE_LIBS})
 
 install(TARGETS kde4-config ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-
-########### next target ###############
-
 ########### install files ###############
 
 install(

kdemacros.h.cmake

@@ -28,6 +28,8 @@
 #ifndef _KDE_MACROS_H_
 #define _KDE_MACROS_H_
 
+#include <QtCore/qglobal.h>
+
 #cmakedefine __KDE_HAVE_GCC_VISIBILITY
 
 /**
@@ -139,15 +141,8 @@
  * use KDE_CONSTRUCTOR_DEPRECATED instead.
  */
 
-#ifdef __cplusplus
-# include <QtCore/qglobal.h>
-# ifndef KDE_DEPRECATED
-#  ifdef KDE_DEPRECATED_WARNINGS
-#   define KDE_DEPRECATED Q_DECL_DEPRECATED
-#  else
-#   define KDE_DEPRECATED
-#  endif
-# endif
+#ifndef KDE_DEPRECATED
+# define KDE_DEPRECATED Q_DECL_DEPRECATED
 #endif
 
 /**