diff options
| author | Dawid Wróbel <me@dawidwrobel.com> | 2021-09-17 17:20:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 08:20:35 -0700 |
| commit | 8a943f71ffb6d99ac8800b71172d4eff2d0c6df4 (patch) | |
| tree | 93d6541c3b6b789c981c29bfbf763f0fe995370f /ports | |
| parent | 6edc46f862f9931d174ffbd45fb07f8df3edf040 (diff) | |
| download | vcpkg-8a943f71ffb6d99ac8800b71172d4eff2d0c6df4.tar.gz vcpkg-8a943f71ffb6d99ac8800b71172d4eff2d0c6df4.zip | |
[kf5*] re-enable parallel configure, speed up compilation (#20202)
* [kf5*] re-enable parallel configure
* [kf5*] update versions
Diffstat (limited to 'ports')
56 files changed, 112 insertions, 47 deletions
diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 479b4496f..ef1582bc0 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -17,8 +17,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index 2ece7aa50..227be8c66 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5archive", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "dependencies": [ diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake index 30b4b281a..ed6183e4b 100644 --- a/ports/kf5attica/portfile.cmake +++ b/ports/kf5attica/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
)
diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json index 83ab52cd2..4234fb9a8 100644 --- a/ports/kf5attica/vcpkg.json +++ b/ports/kf5attica/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5attica", "version-semver": "5.84.0", + "port-version": 1, "description": "A Qt library that implements the Open Collaboration Services API", "homepage": "https://api.kde.org/frameworks/attica/html/index.html", "dependencies": [ diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index da48a9c9d..806e81226 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index 3b15b73bd..2942db273 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5auth", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 9690c58f2..6637557aa 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -10,8 +10,10 @@ vcpkg_find_acquire_program(GPERF) get_filename_component(GPERF_EXE_PATH ${GPERF} DIRECTORY) vcpkg_add_to_path(${GPERF_EXE_PATH}) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index de0042d38..94958f804 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5codecs", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 4bb886a36..a24e0c803 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index 2849f7867..9a185f1a1 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5completion", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 3e831a2b9..ddd842766 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -6,10 +6,12 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
)
diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index a2e0f26a1..cccf3ac82 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5config", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake index cb7282ada..2f1a73a5f 100644 --- a/ports/kf5configwidgets/portfile.cmake +++ b/ports/kf5configwidgets/portfile.cmake @@ -14,8 +14,10 @@ vcpkg_check_features( designerplugin BUILD_DESIGNERPLUGIN ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json index bab6562d5..4950f72f9 100644 --- a/ports/kf5configwidgets/vcpkg.json +++ b/ports/kf5configwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5configwidgets", "version-semver": "5.84.0", + "port-version": 1, "description": "Widgets for configuration dialogs", "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 24f1d7841..e13797325 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -8,9 +8,11 @@ vcpkg_from_github( fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
)
diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 7d81987f0..223736982 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5coreaddons", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 32dc7ff8e..b6382e19c 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -8,9 +8,11 @@ vcpkg_from_github( support_static_builds.patch # https://invent.kde.org/frameworks/kcrash/-/merge_requests/23 ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 6976bb5d4..9b6b62bc9 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5crash", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 372773c44..73aab78ae 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index c545dc94a..dd485ad52 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5dbusaddons", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index dbdbbdf8f..decf668c1 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index c6afe6043..25aefeeca 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5globalaccel", "version-semver": "5.84.0", + "port-version": 1, "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index a298210c3..f6da2d131 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -18,8 +18,10 @@ if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) message(FATAL_ERROR "Feature wayland is only supported on Linux.")
endif()
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 369ff2f10..c152961a8 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5guiaddons", "version-semver": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 765d75230..ee0ae5f44 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -6,10 +6,12 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
)
diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 1d79a7111..1993091f7 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5holidays", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 415530d1e..e7825c86e 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -12,9 +12,11 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 149194bdb..bab7f151d 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5i18n", "version": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake index 807c70528..03d00588b 100644 --- a/ports/kf5iconthemes/portfile.cmake +++ b/ports/kf5iconthemes/portfile.cmake @@ -14,8 +14,10 @@ vcpkg_check_features( designerplugin BUILD_DESIGNERPLUGIN ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json index d3ba8975e..3c7db55be 100644 --- a/ports/kf5iconthemes/vcpkg.json +++ b/ports/kf5iconthemes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5iconthemes", "version": "5.84.0", + "port-version": 1, "description": "Icon GUI utilities", "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index a45b13bbb..5e9616cb7 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_from_github( SHA512 1fd6a6194a718184dcbed0131a2b93575382b3ef7620049cb7a1ac2e55f271113c880d90b76fd6967b720fc44762f10119e8629bda30e6dea10f61ce22f9e02c
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 5022b2142..5e628b41a 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5itemmodels", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 51707dd62..567e8f770 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_from_github( SHA512 d6a16ebbe57b6ac1b766d77b8b262b0ec72a5e256e5b3fbf7b95d901b4e45300eda2933f74a5a66cb6b2fec062fb4a6c9253e3376b13ab889f0bfd52c23cf5d4
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index f7e410149..d80af211c 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5itemviews", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake index 92caa0db7..f285c8a50 100644 --- a/ports/kf5jobwidgets/portfile.cmake +++ b/ports/kf5jobwidgets/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
)
diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json index 9e4e82e6f..b02a341d0 100644 --- a/ports/kf5jobwidgets/vcpkg.json +++ b/ports/kf5jobwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5jobwidgets", "version-semver": "5.84.0", + "port-version": 1, "description": "Widgets for showing progress of asynchronous jobs", "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index f67cfb852..a9661cf07 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 086ffbdfb..a874e8db7 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5package", "version": "5.84.0", + "port-version": 1, "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index 9897fb89b..f2d8ac877 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 7a99dc145..7513e48fe 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5plotting", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 71077a8f5..acb0876ed 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -31,8 +31,10 @@ get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 69f73cd9c..72136bf20 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5service", "version": "5.84.0", + "port-version": 1, "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 849281621..9474f1c00 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -33,9 +33,11 @@ get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
)
diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index fa67c524d..c825d05b8 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5solid", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index 2cdff734d..1cda95d5c 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
-DKDE_INSTALL_PLUGINDIR=plugins
diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index d9d0f1173..52cb029d9 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5sonnet", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 1453c26d8..9003e60f5 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -10,8 +10,10 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
vcpkg_add_to_path("${PERL_EXE_PATH}")
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index 5c4cb98a7..d50b0e713 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5syntaxhighlighting", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake index 09a63f7b5..eb3cced28 100644 --- a/ports/kf5textwidgets/portfile.cmake +++ b/ports/kf5textwidgets/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json index 49c0a4579..dfb7e271d 100644 --- a/ports/kf5textwidgets/vcpkg.json +++ b/ports/kf5textwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5textwidgets", "version": "5.84.0", + "port-version": 1, "description": "Text editing widgets", "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake index fb58b065c..e7300f744 100644 --- a/ports/kf5wallet/portfile.cmake +++ b/ports/kf5wallet/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
- DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTING=OFF
-DBUILD_KWALLETD=OFF
diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json index 964136b21..0d4876849 100644 --- a/ports/kf5wallet/vcpkg.json +++ b/ports/kf5wallet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5wallet", "version-semver": "5.84.0", + "port-version": 1, "description": "Safe desktop-wide storage for passwords", "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 453397dad..dcf65ec6b 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master
)
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index 23429f983..4b98e7c00 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 59244479c..45173fe11 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -12,8 +12,10 @@ if (VCPKG_TARGET_IS_LINUX) message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev")
endif()
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+
vcpkg_cmake_configure(
- DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_TESTING=OFF
diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index 18f247e64..ab42649ad 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5windowsystem", "version-semver": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ |