diff options
| author | Alexander Lohnau <alexander.lohnau@gmx.de> | 2021-01-19 17:07:39 +0100 |
|---|---|---|
| committer | Alexander Lohnau <alexander.lohnau@gmx.de> | 2021-01-19 17:07:39 +0100 |
| commit | 8e4aebd8c10f0bed761f41ea56015893ab363fde (patch) | |
| tree | 9feb31dccd5f07f060aa5f423f5e0559973b4bed | |
| parent | a6be96a0c84b215de7f6fb397255af252adf7fc1 (diff) | |
| download | extra-cmake-modules-8e4aebd8c10f0bed761f41ea56015893ab363fde.tar.gz extra-cmake-modules-8e4aebd8c10f0bed761f41ea56015893ab363fde.tar.bz2 | |
Revert "Add clang-format target by default in KDEFrameworkCompilerSettings"
This reverts commit a6be96a0c84b215de7f6fb397255af252adf7fc1.
| -rw-r--r-- | kde-modules/KDEClangFormat.cmake | 8 | ||||
| -rw-r--r-- | kde-modules/KDEFrameworkCompilerSettings.cmake | 9 |
2 files changed, 0 insertions, 17 deletions
diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake index f1c98ae6..7f85508b 100644 --- a/kde-modules/KDEClangFormat.cmake +++ b/kde-modules/KDEClangFormat.cmake @@ -14,8 +14,6 @@ # # Using this function will create a clang-format target that will format all # ``<files>`` passed to the function with the predefined KDE clang-format style. -# Since version 5.79 this function is called by default in KDEFrameworkCompilerSettings. If directories should be excluded from -# the formatting a .clang-format file with "DisableFormat: true" and "SortIncludes: false" should be created. # # Example usage: # @@ -29,7 +27,6 @@ #============================================================================= # SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullmann@kde.org> -# SPDX-FileCopyrightText: 2021 Alexander Lohnau <alexander.lohnau@gmx.de> # # SPDX-License-Identifier: BSD-3-Clause @@ -43,11 +40,6 @@ endif() # formatting target function(KDE_CLANG_FORMAT) - if (TARGET clang-format) - message(WARNING "the kde_clang_format function was already called") - return() - endif() - # add target without specific commands first, we add the real calls file-per-file to avoid command line length issues add_custom_target(clang-format COMMENT "Formatting sources in ${CMAKE_CURRENT_SOURCE_DIR} with ${KDE_CLANG_FORMAT_EXECUTABLE}...") diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake index 2a6a4f22..27298b8a 100644 --- a/kde-modules/KDEFrameworkCompilerSettings.cmake +++ b/kde-modules/KDEFrameworkCompilerSettings.cmake @@ -26,7 +26,6 @@ # SPDX-License-Identifier: BSD-3-Clause include(KDECompilerSettings NO_POLICY_SCOPE) -include(KDEClangFormat) add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII @@ -65,11 +64,3 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant" ) endif() endif() - -# add clang-format target -file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) -# The build folder should be skipped -list(FILTER ALL_CLANG_FORMAT_SOURCE_FILES EXCLUDE REGEX "/build.*/") -# The templates should also be skipped, clang-format would mess up the template macros -list(FILTER ALL_CLANG_FORMAT_SOURCE_FILES EXCLUDE REGEX "templates/") -kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) |