Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: merge kdefakes into kdecore

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-27 18:20:29 +00:00
parent bd72097a15
commit 7829cff6c9
4 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/modules/FindKDE4Internal.cmake
View file

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

26
kdecore/CMakeLists.txt
View file

@ -133,23 +133,6 @@ add_subdirectory(network/kssld)
########### next target ############### ########### 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 set(kdecore_LIB_SRCS
compression/kgzipfilter.cpp compression/kgzipfilter.cpp
compression/kfilterbase.cpp compression/kfilterbase.cpp
@ -295,7 +278,7 @@ set(kdecore_LIB_SRCS
util/kshell_unix.cpp util/kshell_unix.cpp
util/kuser_unix.cpp util/kuser_unix.cpp
util/kmacroexpander_unix.cpp util/kmacroexpander_unix.cpp
fakes.c fakes.cpp
${kdecore_OPTIONAL_SRCS} ${kdecore_OPTIONAL_SRCS}
${KAUTH_BACKEND_SRCS} ${KAUTH_BACKEND_SRCS}
@ -322,6 +305,10 @@ if(FAM_FOUND)
target_link_libraries(kdecore PRIVATE ${FAM_LIBRARIES}) target_link_libraries(kdecore PRIVATE ${FAM_LIBRARIES})
endif(FAM_FOUND) endif(FAM_FOUND)
if(NOT HAVE_TRUNC)
target_link_libraries(kdecore PRIVATE m)
endif()
target_link_libraries(kdecore PUBLIC target_link_libraries(kdecore PUBLIC
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
@ -379,9 +366,6 @@ target_link_libraries(kde4-config ${KDE4_KDECORE_LIBS})
install(TARGETS kde4-config ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kde4-config ${INSTALL_TARGETS_DEFAULT_ARGS})
########### next target ###############
########### install files ############### ########### install files ###############
install( install(

0
kdecore/fakes.c → kdecore/fakes.cpp
View file

9
kdemacros.h.cmake
View file

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