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

generic: prepare for release, minor build system cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-10-31 04:24:11 +02:00
parent 4a7e7dacad
commit 941fd29d95
7 changed files with 44 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -9,7 +9,7 @@ include(CPack)
################# set KDE specific information ################# ################# set KDE specific information #################
set(KDE_VERSION_MAJOR 4) set(KDE_VERSION_MAJOR 4)
set(KDE_VERSION_MINOR 17) set(KDE_VERSION_MINOR 18)
set(KDE_VERSION_RELEASE 0) set(KDE_VERSION_RELEASE 0)
set(KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" ) set(KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
set(KDE_VERSION_STRING "${KDE_VERSION}") set(KDE_VERSION_STRING "${KDE_VERSION}")

10
cmake/modules/FindKDE4Internal.cmake
View file

@ -201,6 +201,8 @@
# Debug # Debug
# optimised but debuggable, debugging on (-g) # optimised but debuggable, debugging on (-g)
# (-fno-reorder-blocks -fno-schedule-insns -fno-inline) # (-fno-reorder-blocks -fno-schedule-insns -fno-inline)
# MinSizeRel:
# optimization for smallest size, no debugging information
# #
# #
# The default buildtype is RelWithDebInfo. # The default buildtype is RelWithDebInfo.
@ -214,7 +216,7 @@
# To acomplish that one should use the appropriate cmake syntax for # 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. 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 # 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 # 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. # 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. # KDE_VERSION is set in KDE4Config.cmake since KDE 4.17.x.
if(NOT KDE_MIN_VERSION) if(NOT KDE_MIN_VERSION)
set(KDE_MIN_VERSION "4.17.0") set(KDE_MIN_VERSION "4.18.0")
endif() endif()
set(KDE4_INSTALLED_VERSION_OK FALSE) 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" # inside kdelibs the include dir and lib dir are internal, not "found"
if(NOT _kdeBootStrapping) if(NOT _kdeBootStrapping)
if(KDE4_INCLUDE_DIR) 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() else()
message(STATUS "ERROR: unable to find the KDE 4 headers") message(STATUS "ERROR: unable to find the KDE 4 headers")
endif() endif()
if(KDE4_LIB_DIR) 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() else()
message(STATUS "ERROR: unable to find the KDE 4 core library") message(STATUS "ERROR: unable to find the KDE 4 core library")
endif() endif()

2
cmake/modules/KDE4Defaults.cmake
View file

@ -30,7 +30,7 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
# define the generic version of the libraries here, this makes it easy to # 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 # advance it when the next KDE release comes. Use this version number for
# libraries # libraries
set(GENERIC_LIB_VERSION "4.17.0") set(GENERIC_LIB_VERSION "4.18.0")
set(GENERIC_LIB_SOVERSION "4") set(GENERIC_LIB_SOVERSION "4")
# Use this version number for libraries which are experimental # Use this version number for libraries which are experimental

20
interfaces/khexedit/CMakeLists.txt
View file

@ -1,9 +1,17 @@
########### install files ############### ########### install files ###############
install( FILES byteseditinterface.h valuecolumninterface.h charcolumninterface.h zoominterface.h clipboardinterface.h DESTINATION ${INCLUDE_INSTALL_DIR}/khexedit ) install(
FILES
install( FILES kbytesedit.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) byteseditinterface.h
valuecolumninterface.h
charcolumninterface.h
zoominterface.h
clipboardinterface.h
DESTINATION ${INCLUDE_INSTALL_DIR}/khexedit
)
install(
FILES
kbytesedit.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)

21
interfaces/kimproxy/CMakeLists.txt
View file

@ -17,32 +17,41 @@ add_library(kimproxy ${LIBRARY_TYPE} ${kimproxy_LIB_SRCS})
target_link_libraries(kimproxy PRIVATE ${KDE4_KIO_LIBS}) target_link_libraries(kimproxy PRIVATE ${KDE4_KIO_LIBS})
target_link_libraries(kimproxy PUBLIC ${QT_QTCORE_LIBRARY}) target_link_libraries(kimproxy PUBLIC ${QT_QTCORE_LIBRARY})
set_target_properties(kimproxy PROPERTIES set_target_properties(
kimproxy PROPERTIES
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} SOVERSION ${GENERIC_LIB_SOVERSION}
) )
########### install files ############### ########### 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_export.h
kimproxy.h kimproxy.h
DESTINATION ${INCLUDE_INSTALL_DIR} DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel COMPONENT Devel
) )
install(FILES install(
FILES
dbusinstantmessenger.desktop dbusinstantmessenger.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} DESTINATION ${SERVICETYPES_INSTALL_DIR}
) )
install(FILES install(
FILES
kcm_instantmessenger.desktop kcm_instantmessenger.desktop
DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser
) )
install(FILES install(
FILES
org.kde.KIMIface.xml org.kde.KIMIface.xml
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
) )

4
interfaces/kimproxy/icons/CMakeLists.txt
View file

@ -2,7 +2,3 @@
########### install files ############### ########### install files ###############
kde4_install_icons(${ICON_INSTALL_DIR}) kde4_install_icons(${ICON_INSTALL_DIR})

6
interfaces/kio/CMakeLists.txt
View file

@ -1 +1,5 @@
install( FILES http.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) install(
FILES
http.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kio
)