From c5fafc43e5e3ba2195b20112b534765b4aec8662 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 12 Oct 2015 13:01:48 +0300 Subject: [PATCH] generic: remove platform cmake file and other non-relevant to the project files --- .commit-template | 45 ---------------------------- .emacs-dirvars | 14 --------- .gitexcludes | 9 +----- .reviewboardrc | 4 --- CMakeLists.txt | 10 ++----- CreateKDEPlatformProfile.cmake | 35 ---------------------- cmake/modules/FindKDE4Internal.cmake | 1 - 7 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 .commit-template delete mode 100644 .emacs-dirvars delete mode 100644 .reviewboardrc delete mode 100644 CreateKDEPlatformProfile.cmake diff --git a/.commit-template b/.commit-template deleted file mode 100644 index 14f952f7..00000000 --- a/.commit-template +++ /dev/null @@ -1,45 +0,0 @@ -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# You MUST wrap all lines at 72 characters. -# Please see http://techbase.kde.org/Policies/Commit_Policy -# -# For Git commit hook keywords see: -# http://community.kde.org/Sysadmin/GitKdeOrgManual#Commit_hook_keywords -# -# ==[ Subject: One line ONLY short meaningful description for logs ]===| - -# ==[ Blank: Follow the Subject with a blank line, do NOT remove ]=====| - -# ==[ Details: Describe what changed and explain why it changed]=======| - - -# ==[ Fields: Uncomment and edit where applicable ]====================| -# -# --[ Close bug in bugs.kde.org as fixed ]-----------------------------| -#BUG: -#FIXED-IN: -# -# --[ Add to release changelog optionally close wish in bugs.kde.org ]-| -#FEATURE: -#FIXED-IN: -# -# --[ Copy commit message to a bug or wish in bugs.kde.org ]-----------| -#CCBUG: -# -# --[ Copy commit message to an email address ]------------------------| -#CCMAIL: -# -# --[ Close a review on git.reviewboard.kde.org as submitted ]---------| -#REVIEW: -# -# --[ Notify documentation team of user visible changes ]--------------| -#GUI: -# -# --[ Notify Commit Digest team of something interesting ]-------------| -#DIGEST: -# -# --[ Mark commit as silent for commit filter filtering. ]-------------| -# [ Use sparingly and only for uninteresting and ] -# [ uncontroversial commits. ] -#GIT_SILENT diff --git a/.emacs-dirvars b/.emacs-dirvars deleted file mode 100644 index 3cc94670..00000000 --- a/.emacs-dirvars +++ /dev/null @@ -1,14 +0,0 @@ -;; -*- emacs-lisp -*- -;; -;; This file is processed by the dirvars emacs package. Each variable -;; setting below is performed when this dirvars file is loaded. -;; -indent-tabs-mode: nil -tab-width: 8 -c-basic-offset: 4 -evaluate: (c-set-offset 'innamespace '0) -kde-emacs-after-parent-string: "" -evaluate: (c-set-offset 'inline-open '0) -kdab-qt-version: 4 -kdab-jump-project-name: kde -magic-parens-mode: nil diff --git a/.gitexcludes b/.gitexcludes index 4dd8926c..5ffd1e06 100755 --- a/.gitexcludes +++ b/.gitexcludes @@ -55,15 +55,8 @@ ehthumbs.db Icon? Thumbs.db -# You can uncomment the ".directory" it if you don't care about e.g.: -# -# kde-baseapps/konqueror/sidebar/trees/init/remote/.directory -# kde-baseapps/konqueror/sidebar/trees/init/remote/web/.directory -# kde-baseapps/konqueror/sidebar/trees/init/remote/ftp/.directory -# kde-baseapps/konqueror/sidebar/trees/init/services/.directory -# -#*.directory +*.directory *.kdev4 *-swp *.swp diff --git a/.reviewboardrc b/.reviewboardrc deleted file mode 100644 index e57cb363..00000000 --- a/.reviewboardrc +++ /dev/null @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -REPOSITORY = "git://anongit.kde.org/kdelibs" -BRANCH = "master" -TARGET_GROUPS = "kdelibs" diff --git a/CMakeLists.txt b/CMakeLists.txt index 83ef07ad..85a1325c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,7 @@ set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distrib set (KDE_DEFAULT_HOME ".katana" CACHE STRING "The default home directory" ) -################# write platform profile file which will be installed ################# -include(CreateKDEPlatformProfile.cmake) - -if(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED) - set(KDE_NO_DEPRECATED TRUE) -endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED) +set (KDE_NO_DEPRECATED TRUE CACHE BOOL "Whether deprecated functionality is desired") ################# now find all used packages ################# @@ -31,7 +26,7 @@ set (QT_MIN_VERSION "4.8.2") find_package(KDE4Internal REQUIRED) include(KDE4Defaults) -include (MacroLibrary) +include(MacroLibrary) if(UNIX AND Q_WS_X11) #X11 Session Management (SM) is required @@ -270,7 +265,6 @@ include(CreateKDELibsDependenciesFile.cmake) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h DESTINATION ${INCLUDE_INSTALL_DIR} ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDEPlatformProfile.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) # run a script before installing the exports files which deletes previously installed diff --git a/CreateKDEPlatformProfile.cmake b/CreateKDEPlatformProfile.cmake deleted file mode 100644 index a39f2643..00000000 --- a/CreateKDEPlatformProfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# this file is included by kdelibs/CMakeLists.txt and contains the cmake code -# which creates the KDEPlatformProfile.cmake file, which is installed by kdelibs - -######## write profile file which will be installed ######### - -# Desktop profile (default profile) -if (KDE_PLATFORM_PROFILE STREQUAL "Desktop" OR NOT KDE_PLATFORM_PROFILE) - set(KDE_PLATFORM_PROFILE "Desktop") - set(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION FALSE) - set(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION FALSE) - set(KDE_PLATFORM_FEATURE_KIO_INPROCESS FALSE) - set(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED FALSE) -endif (KDE_PLATFORM_PROFILE STREQUAL "Desktop" OR NOT KDE_PLATFORM_PROFILE) - -# Mobile profile -if (KDE_PLATFORM_PROFILE STREQUAL "Mobile") - set(KDE_PLATFORM_PROFILE "Mobile") - set(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION TRUE) - set(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION TRUE) - set(KDE_PLATFORM_FEATURE_KIO_INPROCESS TRUE) - set(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED TRUE) - message(STATUS "KDE Platform Profile: MOBILE. Please be aware that this version of the KDE platform is BINARY INCOMPATIBLE to standard KDE. At this time no binary compatibility is guaranteed even within the mobile target.") -endif (KDE_PLATFORM_PROFILE STREQUAL "Mobile") - - -# Writing the profile file -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/KDEPlatformProfile.cmake -"# this file was generated during the kdelibs build process -set(KDE_PLATFORM_PROFILE \"${KDE_PLATFORM_PROFILE}\") -set(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION ${KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION}) -set(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION ${KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION}) -set(KDE_PLATFORM_FEATURE_KIO_INPROCESS ${KDE_PLATFORM_FEATURE_KIO_INPROCESS}) -set(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED ${KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED}) -") - diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake index b7dcefe6..153b78c1 100644 --- a/cmake/modules/FindKDE4Internal.cmake +++ b/cmake/modules/FindKDE4Internal.cmake @@ -380,7 +380,6 @@ else (_kdeBootStrapping) # These files contain information about the installed kdelibs, Alex include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) - include(${kde_cmake_module_dir}/KDEPlatformProfile.cmake) # Check the version of KDE. It must be at least KDE_MIN_VERSION as set by the user. # KDE_VERSION is set in KDELibsDependencies.cmake since KDE 4.0.x. Alex