summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 9.0.0-beta2Eike Ziller2022-10-131-3/+3
| | | | | | Change-Id: I2ad221b1f6eef849220de2870ac2219e5c008279 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* build.py: Add option to call cpackEike Ziller2022-10-071-4/+10
| | | | | | | | | | | | Adds --with-cpack option. - macOS: does nothing (we already create a better, signed disk image) - Linux: creates qtcreator.deb in build directory - Windows: Checks for NSIS and WIX installation, creates qtcreator.exe and qtcreator.msi as appropriate Change-Id: Ie7816d04cb2e01e90795481e1519b0a6645f5cd3 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Add cpack packaging supportCristian Adam2022-09-281-0/+43
| | | | | | | | | | | | | Tested on all desktop platforms like this: * Windows with cpack -G NSIS64|WIX|IFW * Ubuntu Linux with cpack -G DEB * macOS with cpack -G DragNDrop Fixes: QTCREATORBUG-28199 Change-Id: I5cd66aa387cc9677303ac3aece28eccb710d074f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Fix WITH_SANITIZEMarcus Tillmanns2022-09-202-5/+10
| | | | | | | | | | | | | Adding qtc_enable_sanitize to add_qtc_executable to also instrument applications Changing qtc_enable_sanitize to use target_compile_options instead of trying to modify CMAKE_CXX_FLAGS_DEBUG and hoping that nobody else overwrites it, which previously erased the added flags. Adds support for MSVC /fsanitize Change-Id: Ida80cfd7ef7ea91b2d6473fdc047cb7132cdfec6 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Require Qt 6.2 for building Qt CreatorEike Ziller2022-07-111-1/+1
| | | | | | | Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@qt.io>
* Bump version to 9.0.0-beta1Eike Ziller2022-07-081-3/+3
| | | | | Change-Id: If64527bc1f5af72f488a96bb134e70a4194515af Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix include paths passed to lupdateEike Ziller2022-07-081-0/+3
| | | | | | | | | | | | | | | | | | The include paths that we extract from the targets often still contain the generator expression, like $<BUILD_INTERFACE:actual/include/path>. Throw away "paths" with generator expressions that we don't care about, and strip the BUILD_INTERFACE expression around the paths, which are the ones that we do care about. This wasn't only partially relevant so far, though it probably was the reason for the need for fully qualified tr(...) calls at some places. It becomes essential when we move to the <Plugin>::Tr class, which requires an include to <plugin>tr.h, which is otherwise not found for files that are not in the same directory. Change-Id: I7a0183f002973069839920ec29944342cfd91721 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-081-3/+3
|\ | | | | | | | | | | | | Conflicts: share/qtcreator/translations/qtcreator_ja.ts Change-Id: I436b8f60971f11a5fb7962a57600ad075135f397
| * Bump version to 8.0.0Eike Ziller2022-07-071-3/+3
| | | | | | | | | | Change-Id: Ibf884cf0128e6e24e09c0b04e20a4a8ba26313d7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-071-5/+23
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/libs/utils/terminalprocess.cpp tests/auto/qml/qmldesigner/coretests/CMakeLists.txt Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd
| * COIN: Arm auto testsEike Ziller2022-07-051-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of our auto tests fail, so add an EXCLUDE_FROM_PRECHECK option for add_qtc_test, which sets a corresponding label on the ctest, and exclude these when running ctest on COIN. Disable the Googletest based unittests for now, they are inconsistently failing on CI, e.g. sometimes timing out after 60 seconds for tests that usually take only a fraction of a second. tst_perfdata from the perfparser submodule also fails. Temporarily disable it explicitly, until the EXCLUDE_FROM_PRECHECK change can be merged there. Change-Id: I7e9d7aded75bbe8800f82f7aa125c181271a2a1f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-06-292-6/+6
|\ \ | |/ | | | | Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
| * COIN: Add test instructionsEike Ziller2022-06-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now just run them without failing the precheck on failing tests. The test results are only visible in the precheck details on testresults.qt.io Remove the fixed timeout of 5 seconds, since this depends on the test setup where the tests are run, and it is not possible to override a fixed timeout with the --timeout option of ctest. Change-Id: Ib5f12092b64d0cf87e1213b031e1990973e18669 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| * Bump version to 8.0.0-rc1Eike Ziller2022-06-291-3/+3
| | | | | | | | | | Change-Id: I6784f126f9492a7968027f5edb995c94cc097ca3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-06-272-1/+2
|\ \ | |/ | | | | Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
| * CMake build: Don't exclude GTEST tests for dependency checkingEike Ziller2022-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also Googletest based tests should be disabled if dependencies are missing. Amends aac0f2a8f58f62f5b639b14301b56b57d1387a54 Change-Id: I3be6165b8a28428ba34556a1bf438b3000c00056 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Ignore .json.in and .svg files for translationsEike Ziller2022-06-271-0/+1
| | | | | | | | | | | | | | | | | | Amends 30bb32d9aff0754f76cb994026f43271cbd1a2c6 which added the .json.in files to the list of target sources. Change-Id: I7282cfcda50cbd156403a23cce06baed9698bb4d Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Disable warnings for google testsMarco Bubke2022-06-231-1/+1
| | | | | | | | | | | | Change-Id: I5992d0c565690a0dc8a283ab889275dec2182c17 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-06-231-3/+3
|\ \ | |/ | | | | Change-Id: I3f218b52bf6904daca3779fb677e51f6f51f2f9f
| * Bump version to 8.0.0-beta2Eike Ziller2022-06-171-3/+3
| | | | | | | | | | Change-Id: I02a09e916d11c7ce28b2d58ba7517e582e14be06 Reviewed-by: David Schulz <david.schulz@qt.io>
* | add CONDITION support to extend_qtc_targetTim Jenssen2022-06-201-0/+1
|/ | | | | Change-Id: I4d675170386373af14a143cac9c4cef817d0585c Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* CMake: Remove libclang referencesCristian Adam2022-05-241-11/+2
| | | | | | | | | | Now that libclang is no longer used, make sure that all references to libclang are gone. Change-Id: I4b66eff992b22adb6a9c25d34053f2b36079583c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-05-182-25/+11
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmlprojectmanager/qmlprojectplugin.cpp Change-Id: I14030f58303839e706af892dd12a67566e3bed68
| * qds: ENABLE_CRASHPAD on macos (universal builds)Tim Jenssen2022-05-121-25/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using a newer crashpad version build with: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git export PATH=$PWD/depot_tools:$PATH mkdir crashpad cd crashpad ../depot_tools/fetch crashpad cd crashpad gn gen out/Default --args='target_cpu="mac_universal"' ninja -C out/Default Change-Id: I782c09cb564aff725652cd1419a8dec78bc04fc5 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * CMake build: Avoid endless loop if plugin does not existEike Ziller2022-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_property fails if the target does not exist, and _dep stays at some old value. This leads to a) a lot of cmake backtraces with an error message that doesn't add anything useful, and b) an endless loop in find_dependent_plugins. Which in the end leads to 500.000 lines of useless CMake output, repeating "qtcreator/cmake/QtCreatorAPIInternal.cmake:340 (find_dependent_plugins)" Skip get_property if the target doesn't exist. Change-Id: Ic694bc05b3dce5b83220a2f5dab8f063ef692c12 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 7.0.2Eike Ziller2022-04-281-2/+2
| | | | | | | | | | Change-Id: Ib503b94b747698ab9ba9650c9eb0a3e44d6ca968 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake: add defaults from environment for PCH and TestsMarcus Tillmanns2022-05-111-0/+7
| | | | | | | | | | | | | | Change-Id: I7881c483f8c6f35463cff70ee1dbe91f2e6f810b Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake: Ensure qtcreatorcdbext is a shared library for all casesCristian Adam2022-05-031-3/+3
| | | | | | | | | | | | | | | | | | | | qtcreatorcdbext.dll is being loaded by cdb.exe and needs to be a shared library always. Change-Id: I13582f295744d350907284ea02e08ce1e8055dbe Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Fix cmake buildChristian Stenger2022-05-021-2/+2
| | | | | | | | | | | | | | Amends 88781a003ff. Change-Id: I37aa5c3fbf6490a186deacae257858d3ceb817d1 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake: Qt Creator Static build supportCristian Adam2022-04-294-32/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the build system feature that allows Qt Creator's libraries and plugins to be compiled statically. Fixes some symbol clashes when all plugins are linked into the same executable. Support for actually loading static plugins will be added in a separate commit. The feature is controlled by QTC_STATIC_BUILD which by default is OFF. Change-Id: I1fab7953c43e42dc75619e35660029ee067106df Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | CMake: add ccache optionDavid Schulz2022-04-112-8/+18
| | | | | | | | | | Change-Id: I482b0f3ac372f141e465b72fbcca9d8b5c5b352d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-03-311-0/+1
|\ \ | |/ | | | | Change-Id: Ib2267ddbb702564a6e1c8f6b1db802bc9c45759d
| * CMake build: List json.in files for pluginsOrgad Shaneh2022-03-311-0/+1
| | | | | | | | | | | | Change-Id: Ia62e267d97ff225b94fe77da37af4e8fbc5f54b7 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Bump version to 7.0.1Eike Ziller2022-03-241-2/+2
| | | | | | | | | | Change-Id: I73f23e53629e7c8ed39ba06a72b5baff1714e784 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 7.0.0Eike Ziller2022-03-111-3/+3
| | | | | | | | | | Change-Id: Ie403b97a027b15ddfbafa3ffbf46b8883951bb78 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 7.0-rc1v7.0.0-rc1Eike Ziller2022-03-101-3/+3
| | | | | | | | | | Change-Id: Ib643e8a7594fe12d0dab80963258cf7fc3b78d3c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Do not require CMake 3.18Eike Ziller2022-03-031-1/+7
| | | | | | | | | | | | | | | | | | Amends 46f6c5d0055c05941d68a7255d35b3eaba9d7de3 Simply disable this safe-guard for < 3.18. Change-Id: I0ae3b7520a913861c8c9f97ec7e01e5c9c00d362 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMake: require no undefined symbolsThiago Macieira2022-03-022-0/+15
| | | | | | | | | | | | | | | | | | | | | | The ELF default is historical legacy. We should always require all libraries and all plugins to link to their dependencies and not accidentally forget something (like implementing a virtual function). Change-Id: I5e00996d7f4b4a10bc98fffd1629f8bfcf0d1c8f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-02-281-0/+3
|\ \ | |/ | | | | Change-Id: I809383e6c060701a2751197a8bf16add92bfaf0d
| * CMake: Enable higher compiler warnings for building Qt CreatorCristian Adam2022-02-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | The functionality comes from Qt6 and will be enabled only for Qt6 builds. /w3 level for MSVC, -Wall -Wextra for the rest of compilers. Change-Id: Ib62a27e50ce37a6a860ba2bfa1bdb80a7ae60ace Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-02-162-3/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/docker/dockerdevice.cpp src/plugins/mcusupport/mcupackage.cpp src/plugins/mcusupport/mcupackage.h src/plugins/mcusupport/mcusupportoptions.cpp src/plugins/mcusupport/mcusupportoptions.h src/plugins/mcusupport/mcusupportoptionspage.cpp src/plugins/mcusupport/mcusupportsdk.cpp src/plugins/mcusupport/mcusupportsdk.h Change-Id: I8c8f5953a21729ba9178dbc44ed613eed131a0c8
| * McuSupport: basic test & required refactoringPiotr Mućko2022-02-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | Introduced Package interface for mocking purposes. Made some functions visible in headers for testing. Added basic test skeleton for mcu plugin. run cmd: `qtcreator -test McuSupport` Change-Id: I1011d49052bd8c894da393d8a285b241682f1f94 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Tests: Provide some cmake files for manual testsChristian Stenger2022-02-151-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add another option to mark a test as manual and use this for some existing. Manual tests will not be added as a ctest, but they can still get executed explicitly. Beside this allow to use a condition when using add_qtc_test(). Change-Id: I03d5397db36c0a2c9ee506a4214ed68fae6ad6e7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| * Bump version to 7.0-beta2Eike Ziller2022-02-141-3/+3
| | | | | | | | | | Change-Id: Id6c117792e2dbf3a15fcafcc815a243535357f41 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Bump version to 8.0 betaEike Ziller2022-02-111-3/+3
|/ | | | | Change-Id: I03a99d3b134a2116eb12e6d4e98b994d684f133c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Allow adding RPATHs via CMAKE_(BUILD|INSTALL)_RPATHEike Ziller2022-02-101-6/+8
| | | | | | | | | | | Prepend our own relative RPATHs to CMAKE_INSTALL_RPATH (or CMAKE_BUILD_RPATH respectively) instead of overriding them completely. That allows adding an RPATH to e.g. a self-compiled and separately installed Qt to the installed Qt Creator. Fixes: QTCREATORBUG-27008 Change-Id: I8cd9167fdf5ba9838850fcfab8135da9b79e6695 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: install the cmake files inside CMAKE_INSTALL_LIBDIRThiago Macieira2022-02-101-1/+1
| | | | | Change-Id: I54f205f6b7314351b078fffd16d0bab2ccd81cd4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Better detect imported tool locationsAaron Barany2022-02-071-0/+4
| | | | | | | | | | | On some systems IMPORTED_LOCATION isn't set, but configuration-specific locations like IMPORTED_LOCATION_RELEASE are. In these cases, fall back to the location of the release build if the default isn't found. Fixes the build on Arch Linux. Change-Id: Iff87a8356302a260b2ac5f959f835d1cdf8a5c65 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Require CMake 3.16 and remove workaroundsEike Ziller2022-02-022-54/+6
| | | | | | | | | CMake 3.16 is available on the major Linux distributions nowadays, so we can get rid of some workarounds. Change-Id: I32500375748f33c3e40fbd7a08824d823f817a8f Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Clang: Remove redundant warning suppressionsOrgad Shaneh2022-01-301-1/+1
| | | | | | | | They are no longer needed with Clang 12. Change-Id: I964d53e6a106b38cd32a7f34bbad6e15e0dd7e48 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
View Lorry Controller Status