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

generic: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-25 15:49:47 +00:00
parent af85976132
commit 173ca20eff
4 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CMakeLists.txt
View file

@ -193,18 +193,17 @@ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(sys/time.h HAVE_SYS_TIME_H)
include(ConfigureChecks.cmake) include(ConfigureChecks.cmake)
configure_file (config-runtime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-runtime.h ) configure_file(config-runtime.h.cmake ${CMAKE_BINARY_DIR}/config-runtime.h)
configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) configure_file(config-unix.h.cmake ${CMAKE_BINARY_DIR}/config-unix.h )
configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) configure_file(config-X11.h.cmake ${CMAKE_BINARY_DIR}/config-X11.h )
if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) configure_file(startkde.cmake ${CMAKE_BINARY_DIR}/startkde @ONLY)
configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h ) configure_file(config-workspace.h.cmake ${CMAKE_BINARY_DIR}/config-workspace.h )
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/libs)
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/libs)
# libs # libs
add_subdirectory(libs) add_subdirectory(libs)
@ -300,7 +299,7 @@ macro_optional_add_subdirectory(kde-menu)
########### install files ############### ########### install files ###############
# install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kde4 DESTINATION ${BIN_INSTALL_DIR}) # install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kde4 DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR}) install(PROGRAMS ${CMAKE_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR})
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
@ -352,19 +351,19 @@ set(KDE4WORKSPACE_TARGET_PREFIX KDE4Workspace::)
configure_file( configure_file(
KDE4WorkspaceConfig.cmake.in KDE4WorkspaceConfig.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake" "${CMAKE_BINARY_DIR}/KDE4WorkspaceConfig.cmake"
@ONLY @ONLY
) )
configure_file( configure_file(
KDE4WorkspaceVersion.cmake.in KDE4WorkspaceVersion.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceVersion.cmake" "${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake"
@ONLY @ONLY
) )
install( install(
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake ${CMAKE_BINARY_DIR}/KDE4WorkspaceConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceVersion.cmake ${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake
DESTINATION ${DATA_INSTALL_DIR}/cmake/modules DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
) )

3
kcontrol/emoticons/emoticonslist.cpp
View file

@ -23,7 +23,7 @@
#include <QDir> #include <QDir>
#include <QIcon> #include <QIcon>
#include <QLabel> #include <QLabel>
#include <QtGui/qlistwidget.h> #include <QListWidget>
#include <KMessageBox> #include <KMessageBox>
#include <KDebug> #include <KDebug>
#include <KIcon> #include <KIcon>
@ -32,7 +32,6 @@
#include <KFileDialog> #include <KFileDialog>
#include <KInputDialog> #include <KInputDialog>
#include <KUrlRequesterDialog> #include <KUrlRequesterDialog>
#include <kdecore_export.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <kpluginfactory.h> #include <kpluginfactory.h>

2
pics/CMakeLists.txt
View file

@ -4,7 +4,7 @@ add_subdirectory( emoticons )
#add_subdirectory( oxygen ) #add_subdirectory( oxygen )
set(ksvgtopng_SRCS ksvgtopng.cpp ) set(ksvgtopng_SRCS ksvgtopng.cpp )
add_executable(ksvgtopng NOGUI ${ksvgtopng_SRCS}) add_executable(ksvgtopng ${ksvgtopng_SRCS})
target_link_libraries(ksvgtopng ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY}) target_link_libraries(ksvgtopng ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY})
install(TARGETS ksvgtopng ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS ksvgtopng ${INSTALL_TARGETS_DEFAULT_ARGS} )

4
plasma/runners/bookmarks/CMakeLists.txt
View file

@ -21,11 +21,11 @@ set(krunner_bookmarksrunner_SRCS
) )
if(QJSON_FOUND) if(QJSON_FOUND)
set(krunner_bookmarksrunner_SRCS set(krunner_bookmarksrunner_SRCS
${krunner_bookmarksrunner_SRCS} ${krunner_bookmarksrunner_SRCS}
browsers/chromefindprofile.cpp browsers/chromefindprofile.cpp
browsers/chrome.cpp browsers/chrome.cpp
) )
endif(QJSON_FOUND) endif(QJSON_FOUND)