commit: e41b0b28956d54254c714b6dc6b0fd3983c614c7 Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Tue Nov 1 23:36:12 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 5 06:32:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b0b28
dev-qt/qt-creator: fix unnecessary dependence on dev-cpp/yaml-cpp Including the clangtools plugin's CMakeLists.txt causes an unconditional dependence on dev-cpp/yaml-cpp, whether or not the plugin is enabled. Removing 'add_subdirectory(clangtools)' from the parent directory's CMakeLists.txt when the clangtools USE flag is disabled resolves it. Bug: https://bugs.gentoo.org/878753 Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild index e110647e5230..138e0e37a74e 100644 --- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild @@ -180,6 +180,8 @@ src_prepare() { src/libs/CMakeLists.txt cmake_use_remove_addsubdirectory qml advanceddockingsystem \ src/libs/CMakeLists.txt + cmake_use_remove_addsubdirectory clang clangtools \ + src/plugins/CMakeLists.txt cmake_use_remove_addsubdirectory test test \ src/plugins/mcusupport/CMakeLists.txt @@ -338,7 +340,6 @@ src_configure() { # Clang stuff -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) - -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) # QML stuff # -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only @@ -362,6 +363,7 @@ src_configure() { -DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang" -DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm" -DCLANGTOOLING_LINK_CLANG_DYLIB=YES + -DBUILD_PLUGIN_CLANGTOOLS=YES ) fi if use help; then
