From kde-commits Sat Apr 05 17:16:06 2014 From: Michael Palimaka Date: Sat, 05 Apr 2014 17:16:06 +0000 To: kde-commits Subject: [oxygen] /: Remove unused dependencies. Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139671817707922 Git commit f9a43d02ad385d8e44d43035462f33ec6c9aaa94 by Michael Palimaka. Committed on 05/04/2014 at 14:49. Pushed by palimaka into branch 'master'. Remove unused dependencies. REVIEW: 117389 M +2 -5 CMakeLists.txt M +0 -1 liboxygen/CMakeLists.txt M +0 -1 liboxygen/oxygenbaseanimationconfigwidget.cpp http://commits.kde.org/oxygen/f9a43d02ad385d8e44d43035462f33ec6c9aaa94 diff --git a/CMakeLists.txt b/CMakeLists.txt index c90699d..5eba915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,7 @@ find_package(KF5 REQUIRED CONFIG COMPONENTS Service Completion FrameworkIntegration - WindowSystem - KDE4Support) + WindowSystem) = find_package(KDecorations REQUIRED CONFIG) = @@ -28,10 +27,8 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 l= ibraries" PURPOSE "Required for building the X11 based works= pace" ) if(X11_FOUND) - find_package(XCB REQUIRED COMPONENTS XCB XFIXES DAMAGE COMPOSITE SHAPE S= YNC RENDER RANDR KEYSYMS IMAGE SHM XTEST) + find_package(XCB REQUIRED COMPONENTS XCB) set_package_properties(XCB PROPERTIES TYPE REQUIRED) - find_package(XCB COMPONENTS ICCCM) - add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test= applications for KWin") = find_package(Qt5 REQUIRED CONFIG COMPONENTS X11Extras) endif() diff --git a/liboxygen/CMakeLists.txt b/liboxygen/CMakeLists.txt index 223e900..4419809 100644 --- a/liboxygen/CMakeLists.txt +++ b/liboxygen/CMakeLists.txt @@ -75,7 +75,6 @@ target_link_libraries(oxygenstyleconfig Qt5::Widgets PRIVATE KF5::I18n - KF5::KDE4Support ) = set_target_properties(oxygenstyleconfig PROPERTIES VERSION 5.0.0 SOVERSION= 5 DEFINE_SYMBOL MAKE_OXYGENSTYLE_LIB ) diff --git a/liboxygen/oxygenbaseanimationconfigwidget.cpp b/liboxygen/oxyg= enbaseanimationconfigwidget.cpp index 68f7d32..9fd3ae8 100644 --- a/liboxygen/oxygenbaseanimationconfigwidget.cpp +++ b/liboxygen/oxygenbaseanimationconfigwidget.cpp @@ -33,7 +33,6 @@ #include #include #include -#include = namespace Oxygen {