mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: prepare for release, minor build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev
parent
4a7e7dacad
commit
941fd29d95
7 changed files with 44 additions and 25 deletions
|
|
@ -9,7 +9,7 @@ include(CPack)
|
|||
################# set KDE specific information #################
|
||||
|
||||
set(KDE_VERSION_MAJOR 4)
|
||||
set(KDE_VERSION_MINOR 17)
|
||||
set(KDE_VERSION_MINOR 18)
|
||||
set(KDE_VERSION_RELEASE 0)
|
||||
set(KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
|
||||
set(KDE_VERSION_STRING "${KDE_VERSION}")
|
||||
|
|
|
|||
|
|
@ -201,6 +201,8 @@
|
|||
# Debug
|
||||
# optimised but debuggable, debugging on (-g)
|
||||
# (-fno-reorder-blocks -fno-schedule-insns -fno-inline)
|
||||
# MinSizeRel:
|
||||
# optimization for smallest size, no debugging information
|
||||
#
|
||||
#
|
||||
# The default buildtype is RelWithDebInfo.
|
||||
|
|
@ -214,7 +216,7 @@
|
|||
# To acomplish that one should use the appropriate cmake syntax for
|
||||
# find_package. For example to depend on kdelibs >= 4.1.0 one should use
|
||||
#
|
||||
# find_package(KDE4 4.14.3 REQUIRED)
|
||||
# find_package(KDE4 4.18.0 REQUIRED)
|
||||
#
|
||||
# In earlier versions of KDE you could use the variable KDE_MIN_VERSION to
|
||||
# have such a dependency. This variable is deprecated with KDE 4.2.0, but
|
||||
|
|
@ -352,7 +354,7 @@ else(_kdeBootStrapping)
|
|||
# Check the version of KDE. It must be at least KDE_MIN_VERSION as set by the user.
|
||||
# KDE_VERSION is set in KDE4Config.cmake since KDE 4.17.x.
|
||||
if(NOT KDE_MIN_VERSION)
|
||||
set(KDE_MIN_VERSION "4.17.0")
|
||||
set(KDE_MIN_VERSION "4.18.0")
|
||||
endif()
|
||||
|
||||
set(KDE4_INSTALLED_VERSION_OK FALSE)
|
||||
|
|
@ -908,13 +910,13 @@ macro(KDE4_PRINT_RESULTS)
|
|||
# inside kdelibs the include dir and lib dir are internal, not "found"
|
||||
if(NOT _kdeBootStrapping)
|
||||
if(KDE4_INCLUDE_DIR)
|
||||
message(STATUS "Found KDE 4.17 include dir: ${KDE4_INCLUDE_DIR}")
|
||||
message(STATUS "Found KDE 4.18 include dir: ${KDE4_INCLUDE_DIR}")
|
||||
else()
|
||||
message(STATUS "ERROR: unable to find the KDE 4 headers")
|
||||
endif()
|
||||
|
||||
if(KDE4_LIB_DIR)
|
||||
message(STATUS "Found KDE 4.17 library dir: ${KDE4_LIB_DIR}")
|
||||
message(STATUS "Found KDE 4.18 library dir: ${KDE4_LIB_DIR}")
|
||||
else()
|
||||
message(STATUS "ERROR: unable to find the KDE 4 core library")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
|
|||
# define the generic version of the libraries here, this makes it easy to
|
||||
# advance it when the next KDE release comes. Use this version number for
|
||||
# libraries
|
||||
set(GENERIC_LIB_VERSION "4.17.0")
|
||||
set(GENERIC_LIB_VERSION "4.18.0")
|
||||
set(GENERIC_LIB_SOVERSION "4")
|
||||
|
||||
# Use this version number for libraries which are experimental
|
||||
|
|
|
|||
|
|
@ -1,9 +1,17 @@
|
|||
|
||||
########### install files ###############
|
||||
install( FILES byteseditinterface.h valuecolumninterface.h charcolumninterface.h zoominterface.h clipboardinterface.h DESTINATION ${INCLUDE_INSTALL_DIR}/khexedit )
|
||||
|
||||
install( FILES kbytesedit.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
||||
install(
|
||||
FILES
|
||||
byteseditinterface.h
|
||||
valuecolumninterface.h
|
||||
charcolumninterface.h
|
||||
zoominterface.h
|
||||
clipboardinterface.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/khexedit
|
||||
)
|
||||
|
||||
install(
|
||||
FILES
|
||||
kbytesedit.desktop
|
||||
DESTINATION ${SERVICETYPES_INSTALL_DIR}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ set(kimproxy_LIB_SRCS
|
|||
kimproxy.cpp
|
||||
)
|
||||
|
||||
qt4_add_dbus_adaptor( kimproxy_LIB_SRCS org.kde.KIMIface.xml kimproxy.h KIMProxy)
|
||||
qt4_add_dbus_adaptor(kimproxy_LIB_SRCS org.kde.KIMIface.xml kimproxy.h KIMProxy)
|
||||
|
||||
qt4_add_dbus_interface(kimproxy_LIB_SRCS org.kde.KIMIface.xml kimiface )
|
||||
|
||||
|
|
@ -17,32 +17,41 @@ add_library(kimproxy ${LIBRARY_TYPE} ${kimproxy_LIB_SRCS})
|
|||
target_link_libraries(kimproxy PRIVATE ${KDE4_KIO_LIBS})
|
||||
target_link_libraries(kimproxy PUBLIC ${QT_QTCORE_LIBRARY})
|
||||
|
||||
set_target_properties(kimproxy PROPERTIES
|
||||
set_target_properties(
|
||||
kimproxy PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install(TARGETS kimproxy EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(
|
||||
TARGETS kimproxy
|
||||
EXPORT kdelibsLibraryTargets
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
)
|
||||
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
kimproxy_export.h
|
||||
kimproxy.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
dbusinstantmessenger.desktop
|
||||
DESTINATION ${SERVICETYPES_INSTALL_DIR}
|
||||
)
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
kcm_instantmessenger.desktop
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser
|
||||
)
|
||||
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
org.kde.KIMIface.xml
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
|
||||
########### install files ###############
|
||||
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
||||
|
||||
kde4_install_icons(${ICON_INSTALL_DIR})
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
install( FILES http.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
|
||||
install(
|
||||
FILES
|
||||
http.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/kio
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue