diff options
Diffstat (limited to 'ports/ecm')
| -rw-r--r-- | ports/ecm/CONTROL | 4 | ||||
| -rw-r--r-- | ports/ecm/do-not-override-custom-clang-format-files.patch | 33 | ||||
| -rw-r--r-- | ports/ecm/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/ecm/vcpkg.json | 6 |
4 files changed, 44 insertions, 7 deletions
diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL deleted file mode 100644 index ecdc76ea1..000000000 --- a/ports/ecm/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ecm -Version: 5.74.0 -Homepage: https://github.com/KDE/extra-cmake-modules -Description: Extra CMake Modules (ECM), extra modules and scripts for CMake diff --git a/ports/ecm/do-not-override-custom-clang-format-files.patch b/ports/ecm/do-not-override-custom-clang-format-files.patch new file mode 100644 index 000000000..4e7f4e286 --- /dev/null +++ b/ports/ecm/do-not-override-custom-clang-format-files.patch @@ -0,0 +1,33 @@ +From 0d5ed9bb9117f6526691b3572bf85090efbeed4a Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Sat, 30 Jan 2021 13:44:07 +0100 +Subject: [PATCH] KDEClangFormat: Do not override custom clang-format files + +--- + kde-modules/KDEClangFormat.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake +index 6cdbd2b5..995f03ad 100644 +--- a/kde-modules/KDEClangFormat.cmake ++++ b/kde-modules/KDEClangFormat.cmake +@@ -35,7 +35,18 @@ find_program(KDE_CLANG_FORMAT_EXECUTABLE clang-format) + + # instantiate our clang-format file, must be in source directory for tooling if we have the tool + if(KDE_CLANG_FORMAT_EXECUTABLE) +- configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format @ONLY) ++ set(CLANG_FORMAT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format) ++ if (EXISTS ${CLANG_FORMAT_FILE}) ++ file(READ ${CLANG_FORMAT_FILE} CLANG_FORMAT_CONTENTS LIMIT 128) ++ string(FIND "${CLANG_FORMAT_CONTENTS}" "SPDX-FileCopyrightText: 2019 Christoph Cullmann" matchres) ++ if(${matchres} EQUAL -1) ++ message(WARNING "The .clang-format file already exists. Please remove it in order to use the file provided by ECM") ++ else() ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) ++ endif() ++ else() ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) ++ endif() + endif() + + # formatting target diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index c3ef7cdb1..279c7c328 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF 5c191fa1d2383c69ddc075395e04f84b7679613a # v5.74.0 - SHA512 9a520e2cb45f2891cb5b463409063549904574e2ad0c4f77987555fc9aac68589695344a3acaddcb95d2739458031ece489ff9635c7d713c6309e4f9027f6ef7 + REF v5.75.0 + SHA512 486845a91967c89dec42f9120757c7b883006713d0957e9bd21dfacb2911225fe45680590ef3dc5e0d45a9dbc81cf99e1514fb4922b1a027bcba3864da883076 HEAD_REF master + PATCHES + "do-not-override-custom-clang-format-files.patch" ) vcpkg_configure_cmake( @@ -21,7 +23,7 @@ vcpkg_install_cmake() # Remove debug files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecm) +file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json new file mode 100644 index 000000000..0d343e0fd --- /dev/null +++ b/ports/ecm/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ecm", + "version": "5.75.0", + "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", + "homepage": "https://github.com/KDE/extra-cmake-modules" +} |