diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-03-22 09:55:31 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-03-22 11:17:10 +0100 |
| commit | 9e9c598e2d36f4782059579ed2f3f23e9d65f276 (patch) | |
| tree | c0efda6fce114b91788349b94d043e775e12e2fe | |
| parent | dd934e4663aa220d8546326c453de725ec976a22 (diff) | |
CMake: Don't disable qdoc if FEATURE_clangcpp is OFF
The fantastically named feature 'clangcpp' is for controlling whether
lupdate is built with libclang. For qdoc, it's sufficient to depend on
the 'clang' feature.
Change-Id: Icde1dd1be216344b5276d10addd2ba24aa290142
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | configure.cmake | 4 | ||||
| -rw-r--r-- | src/qdoc/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake index b65f1f175..0b5a0c267 100644 --- a/configure.cmake +++ b/configure.cmake @@ -51,7 +51,7 @@ qt_feature("clang" PRIVATE qt_feature("qdoc" PRIVATE LABEL "QDoc" PURPOSE "QDoc is Qt's documentation generator for C++ and QML projects." - CONDITION TARGET Qt::QmlPrivate AND QT_FEATURE_clang AND QT_FEATURE_clangcpp AND QT_FEATURE_commandlineparser AND QT_FEATURE_thread AND QT_LIB_CLANG_VERSION VERSION_GREATER_EQUAL QDOC_MINIMUM_CLANG_VERSION + CONDITION TARGET Qt::QmlPrivate AND QT_FEATURE_clang AND QT_FEATURE_commandlineparser AND QT_FEATURE_thread AND QT_LIB_CLANG_VERSION VERSION_GREATER_EQUAL QDOC_MINIMUM_CLANG_VERSION ) qt_feature("clangcpp" PRIVATE LABEL "Clang-based lupdate parser" @@ -128,7 +128,7 @@ Other than clang's libraries, you may need to install another package, such as c file is in place, the configure script may be able to detect your system-installed libraries without further environment variables. On macOS, you can use Homebrew's llvm package. You will also need to set the FEATURE_clang CMake variable to ON to re-evaluate this check." - CONDITION NOT QT_FEATURE_clang OR NOT QT_FEATURE_clangcpp + CONDITION NOT QT_FEATURE_clang ) qt_configure_add_report_entry( TYPE WARNING diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index bf3355298..9662b34c6 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -5,6 +5,6 @@ add_subdirectory(catch) add_subdirectory(catch_conversions) add_subdirectory(catch_generators) -if(QT_FEATURE_qdoc AND QT_FEATURE_clangcpp) +if(QT_FEATURE_qdoc) add_subdirectory(qdoc) endif() |