From 09b49b48e9be21862d9dc888ba2a45704fabedad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Wed, 11 Dec 2013 17:08:31 +0100 Subject: [PATCH] Fix KDESu, add KDocTools --- tools/kf5-lib-prefix-rename | 3 ++- tools/kf5-lib-prefix-rename-test/expected/CMakeLists.txt | 4 +++- tools/kf5-lib-prefix-rename-test/src/CMakeLists.txt | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/kf5-lib-prefix-rename b/tools/kf5-lib-prefix-rename index a93c7d743..e334f90a0 100755 --- a/tools/kf5-lib-prefix-rename +++ b/tools/kf5-lib-prefix-rename @@ -45,6 +45,7 @@ def replace_all(path): txt = replace_one(txt, "Auth") txt = replace_one(txt, "Completion") txt = replace_one(txt, "Crash") + txt = replace_one(txt, "DocTools") txt = replace_one(txt, "XsltKde") txt = replace_one(txt, "I18n") txt = replace_one(txt, "JobWidgets") @@ -60,7 +61,7 @@ def replace_all(path): txt = replace_one(txt, "KIOWidgets", "KIOWidgets") txt = replace_one(txt, "KIO", "KIO") txt = replace_one(txt, "Kross", "Kross") - txt = replace_one(txt, "KF5Su", "KDESu") + txt = replace_one(txt, "Su", "KDESu") txt = replace_one(txt, "WebKit") txt = replace_one(txt, "Emoticons") txt = replace_one(txt, "IconThemes") diff --git a/tools/kf5-lib-prefix-rename-test/expected/CMakeLists.txt b/tools/kf5-lib-prefix-rename-test/expected/CMakeLists.txt index 73c5038ef..48a286615 100644 --- a/tools/kf5-lib-prefix-rename-test/expected/CMakeLists.txt +++ b/tools/kf5-lib-prefix-rename-test/expected/CMakeLists.txt @@ -1,12 +1,14 @@ find_package(KF5 CONFIG REQUIRED IdleTime ItemModels WidgetsAddons WindowSystem Codecs Archive CoreAddons Solid ThreadWeaver GlobalAccel Config Auth JS Wallet DBusAddons I18n GuiAddons ConfigWidgets Service ItemViews Notifications IconThemes Completion JobWidgets Sonnet TextWidgets XmlGui Crash - Bookmarks Declarative UnitConversion Parts Kross KIO Init) + Bookmarks Declarative UnitConversion Parts Kross KIO Init DocTools Su) find_package(KF5CoreAddons REQUIRED) find_package(KF5Solid REQUIRED) +find_package(KF5Su REQUIRED NO_MODULE) + find_package(KF5Declarative REQUIRED NO_MODULE) find_package(KF5KDE4Support REQUIRED NO_MODULE) diff --git a/tools/kf5-lib-prefix-rename-test/src/CMakeLists.txt b/tools/kf5-lib-prefix-rename-test/src/CMakeLists.txt index 032d7baad..427c0bc3a 100644 --- a/tools/kf5-lib-prefix-rename-test/src/CMakeLists.txt +++ b/tools/kf5-lib-prefix-rename-test/src/CMakeLists.txt @@ -1,12 +1,14 @@ find_package(KF5 CONFIG REQUIRED KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver KF5GlobalAccel KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets Sonnet KTextWidgets XmlGui KCrash - KBookmarks KDeclarative KUnitConversion KParts Kross KIO KInit) + KBookmarks KDeclarative KUnitConversion KParts Kross KIO KInit KDocTools KDESu) find_package(KCoreAddons REQUIRED) find_package(Solid REQUIRED) +find_package(KDESu REQUIRED NO_MODULE) + find_package(KDeclarative REQUIRED NO_MODULE) find_package(KDE4Support REQUIRED NO_MODULE)