diff options
| author |   Peter Levine <plevine457@gmail.com> | 2022-11-01 19:36:12 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-11-05 06:32:43 +0000 |
| commit | e41b0b28956d54254c714b6dc6b0fd3983c614c7 (patch) | |
| tree | e72fd8070ca82e8cee5941d6eb473122ffeda4a8 /dev-qt | |
| parent | dev-qt/qt-creator: fix pkgconfig bdep (diff) | |
| download | gentoo-e41b0b28956d54254c714b6dc6b0fd3983c614c7.tar.gz gentoo-e41b0b28956d54254c714b6dc6b0fd3983c614c7.tar.bz2 gentoo-e41b0b28956d54254c714b6dc6b0fd3983c614c7.zip | |
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@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 |
1 files changed, 3 insertions, 1 deletions
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 |