summaryrefslogtreecommitdiffstats
path: root/configure.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Make the build of some tools configurableLi Xinwei2021-07-091-3/+22
| | | | | | | | | | | | | | | | Inspire from c1cd8b32a65d9d65e3a7ec9fcbd6961a39223102 Make it possible to disable the build of some tools by passing -DFEATURE_*=OFF to CMake. For example, passing -DFEATURE_assistant=OFF should be able to disable the build of Qt assistant. And comment out the lines of kmap2qmap and qev in configure.cmake because they are actually not built currently. Pick-to: 6.2 Change-Id: Id502ad0d411669af224a2da4c9122d05baf331f0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move qtpaths to qtbaseAlexey Edelev2021-03-111-5/+0
| | | | | | Task-number: QTBUG-75870 Change-Id: I3828b6752e4bde08be4f6f6ea2dccaa83222ba82 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add more guidance for missing clang feature checksCraig Scott2021-02-241-2/+6
| | | | | | | | | | | | | The existing warning mentions that CMAKE_PREFIX_PATH or LLVM_INSTALL_DIR needs to be set, or that the relevant libraries could not be found. If users fix these problems, the warning still persists. It is not obvious to the user that they also need to reset the relevant FEATURE_* cache entries to force these checks to be re-evaluated. Update the warning message so that this is now explicitly stated. Pick-to: 6.0 6.1 Change-Id: I99fbe52e5c5523dee31fd9104978e04d00354c17 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Revert "Exclude assistant from build"Kai Koehne2020-11-231-5/+5
| | | | | | | | | | This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d. Reason for revert: See discussion in QTBUG-86746 Pick-to: 6.0.0 6.0 Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Exclude assistant from buildJarek Kobus2020-11-051-5/+5
| | | | | | | Task-number: QTBUG-86746 Tash-number: QTBUG-88123 Change-Id: Ia086ab9a7c193e7829ef886929dc921432f67a1b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* CMake: Do not recommend using llvm-config anymoreKai Koehne2020-09-241-1/+1
| | | | | | | | | | cmake/FindWrapLibClang.cmake does automatically prepend environment variable and CMake variable LLVM_INSTALL_DIR to CMAKE_PREFIX_PATH. So let's document that. Change-Id: I73828e454676571beebcdc4eda3223f18824ecaa Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Disable global promotion of Threads target using new APIAlexandru Croitor2020-08-251-3/+1
| | | | | | | | | | | Revert the previous temporary fix, and use the new API for excluding Threads target from global promotion, thus avoid a configuration error. Task-number: QTBUG-85877 Change-Id: If09d84f7deab07ec20581612d3f29143851f6fdb Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove makeqpfEskil Abrahamsen Blomfeldt2020-08-201-5/+0
| | | | | | | | | The QPF2 file format is no longer supported in Qt since Qt 6, so we no longer need the tool to generate it. Change-Id: I5c0131fa616f7255ca57a00d84f61f221843d869 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* CMake: Temporarily don't promote WrapLibClang to global scopeAlexandru Croitor2020-08-131-1/+3
| | | | | | | | | | | | | | | | | | After 92ee9bd6b885879090ba57e49c8bd84a06d42b2b in qtbase, if LLVM_INSTALL_DIR is provided when configuring qttools, the configuration would fail trying to promote Threads::Threads to global scope. Temporarily remove the PROVIDED_TARGETS argument remove the automatic propagation of the target to global scope, thus avoiding the issue. A better fix will be integrated once a new change is merged to qtbase and we can use the new API for opting out of global promotion. Task-number: QTBUG-85877 Change-Id: I644ee28336c0bf7d8f89ebb2eff0a300c0851a4c Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove winrt specific codeOliver Wolff2020-08-061-7/+1
| | | | | | | | Task-number: QTBUG-84434 Change-Id: I9c3a661e490f3dccea893e213939953465d8970e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix configure.cmake usage for libclangAlexandru Croitor2020-06-291-0/+135
Now that the qmake situation of the configure.json files in regards to libclang is fixed, we need to adjust the CMake files to do the same. Remove the old stale configure.cmake files, create the top-level configure.cmake file, evaluate its features in src dir, and make sure to also create the forwarding headers in the global QtTools module as well. Change FindWrapLibClang to accept a version number, and modify configure.cmake to pass the minimum version to be "8". While libclang 6.x is enough to build Qt with qmake, for some reason CMake needs at least 8.x. Explicitly specifying the minimum version will prevent an old libclang library to be found in Coin, and thus breaking integrations during compilation. Once Coin is updated to include latest libclang, qdoc and lupdate will be built as usual. Change-Id: Iab8ec25d256358005850f25d6395d81e0068edfe Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 02:05:28 +0000