summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake Build: Properly build qtcreatorcdbextCristian Adam2019-10-081-4/+0
| | | | | | Change-Id: I8b4a58d79124debd877442fe23798c77bff723c5 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.10' into 4.11Eike Ziller2019-10-021-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/projectexplorer/projectnodes.h Change-Id: I10a749cca38c2d0929cf4d2b74ab089e14b6157b
| * CMake Build: Fix LLVM lookup for cases when many versions availableAlexander Akulich2019-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If calling both find_package(Clang) and find_package(LLVM), call find_package(Clang) first to get the currently active Clang version by default with a consistent version of LLVM. (Similar to the FindPythonInterp/PythonLibs ordering) Change-Id: Ib6da04e0fb0ffc1fe67a8eafb0c5f04abbb36b6c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | CMake Build: Allow building with Qt5 and Qt6Cristian Adam2019-09-241-4/+8
| | | | | | | | | | | | | | Emulate Qt5's functions/targets with Qt6 equivalents. Change-Id: I6bfc5c8a649f0ddc5f1117bc5b2d0f41cb72c821 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake: Handle translationsTobias Hunger2019-09-171-2/+2
|/ | | | | | | | | | | | | | | | | (Optionally) re-generate .ts files from CMake by running lupdate and run lrelease to generate .qm files. Changes to qmake: * src/libs/3rdparty/syntax-highlighting/src/cli/kate-syntax-highlighter.cpp is no longer translated: It's a command line tool that is not used by creator * src/libs/aggregation/examples/text/main.cpp is no longer included in ts files * src/libs/qt-breakpad/qtcrashhandler/* is no longer included in ts files: It is not built right now Change-Id: Iec018da86a111a68ec983a880cef2961b48ccdf9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Build with PCHCristian Adam2019-08-141-1/+2
| | | | | | | This commit enables building with upstream CMake PCH support. Change-Id: Ib37745b00e7560e804483e7c2c2a3fa7cf6d663c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Add "Devel" packageCristian Adam2019-07-251-67/+2
| | | | | | | | | The "Devel" package will contain headers, libraries, documentation needed by the 3rd parties to build Qt Creator plugins. Fixes: QTCREATORBUG-22514 Change-Id: If54929f823982b921b98a63ff6085d53618a3a49 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Allow brandingEike Ziller2019-06-211-20/+6
| | | | | | | | | | Create your own QtCreatorIDEBranding.cmake somewhere and point cmake to it via CMAKE_MODULE_PATH Task-number: QTCREATORBUG-22488 Change-Id: Ic1057d879c5104b57e4ed8ef8a9c4fc8d4140de9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Do not write versions etc into the cacheEike Ziller2019-06-211-22/+21
| | | | | | | | | | The user is not supposed to change these via configuration. If they are written to the cache, version bumps do not take effect automatically, resulting in quite some hassle. Change-Id: Ibaf9dba02114da1cbc3ec2210ae7c3328f35bb1f Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump versionEike Ziller2019-06-201-3/+3
| | | | | Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Ensure compilation when Qt5::Script is missingCristian Adam2019-06-031-2/+2
| | | | | | | | | | | The Qt5 Visual C++ 2017 64 bit installation doesn't come with Qt5::Script target by default. This patch ensures that Qt Creator can be built with the above Qt5 scenario. Change-Id: Ibe35e9d879ccd51012f53acebfbb7461fd773d4a Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMake: Add Threads::Threads as public dependency to clangrefactoringbackend ↵Tobias Hunger2019-06-031-0/+2
| | | | | | | | library Change-Id: If7d3d4a7226f034d0e4c66726d3a7beed3480efe Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build/macOS: Add iostoolEike Ziller2019-05-241-0/+3
| | | | | | | Task-number: QTCREATORBUG-22475 Change-Id: Ifd9a9dc1483d223c446fd25a45e3cd1778bc94d1 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake build/macOS: Centrally detect system librariesEike Ziller2019-05-241-0/+8
| | | | | | | | | And realize that at most places (except native help viewer) the code using them is not optional on macOS. Change-Id: I308406a0e8f176dad4151d23a33cd3fc0fb8635c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: add docs, clean_docs and install_docs targetsTobias Hunger2019-05-211-0/+2
| | | | | Change-Id: Ic9883f0fc8c85db4573e751261cf347e56777a3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: Get information from qmakeTobias Hunger2019-05-211-0/+34
| | | | | | | Get information that is not available via cmake from qmake. Change-Id: Ib80cd472bcb5ea831991de5fcbcb7e2400a1ce10 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake build / macOS: Fix Info.plistEike Ziller2019-05-201-1/+2
| | | | | | Change-Id: I160c9efd10e62b7e17957117daed376d2ce70601 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Qt Creator CMake portCristian Adam2019-05-171-0/+162
Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
View Lorry Controller Status