summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Packaging: Get rid of binary-artifacts repository usageEike Ziller2020-05-261-1/+0
| | | | | | | | | | We removed the cdbextension and wininterrupt binaries from there a long time ago, and instead package these for the installer. Package newest jom version from its actual release in the installer as well. Task-number: QTCREATORBUG-23908 Change-Id: Ic9bdc97774cbeb894fc261e57af127d6cdc71205 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* CMake build: Move documentation functions to re-usable locationEike Ziller2020-05-251-0/+285
| | | | | | | | | | | Removes "install_..._docs" and "clean_docs" special targets. Instead install documentation with "--install . --component qch_docs" and "--install . --component html_docs" which have the advantage that the install prefix can be specified later on with --prefix. Also removes export of IDE_SOURCE_DIR, which is not used. Change-Id: I4fce0b9aa8c7fc40b7e94e065777ddf4c0b76c41 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Unify handling of qtc_add_... argumentsEike Ziller2020-05-182-13/+19
| | | | | | | Unify handling of EXPLICIT_MOC, SKIP_AUTOMOC, EXTRA_TRANSLATIONS Change-Id: I9f5cbe9fe6b58ec527edd5e25008153455857ed8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Use some more extend_qtc_target even internallyEike Ziller2020-05-181-42/+30
| | | | | | | To avoid duplication. Change-Id: Ida6c1e17a21cfdca9208e089760287ff55bae595 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Avoid using extend_qtc_target directlyEike Ziller2020-05-182-70/+76
| | | | | | | Also add a extend_qtc_test which checks if the test is known. Change-Id: Idd3b3a02ac61fce2622cb8681233cfbd96a77bc4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Move internal functions from QtCreatorAPIEike Ziller2020-05-182-384/+378
| | | | | Change-Id: Iade7ae7533abb8b8ed0ccba8bd246b4a734794b6 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Allow files with relative paths in qtc_copy_to_builddirEike Ziller2020-05-131-2/+8
| | | | | | | | | Files with absolute paths still go directly into DESTINATION directory. Follow-up of a9aa5612345bcfae9a5562e135dec9de8c3b8a8f Change-Id: I558616f78b3e49a8b3be4372791281f5ca9138c9 Reviewed-by: Alexis Murzeau <amubtdx@gmail.com> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: copy clang and resource files only if necessaryAlexis Murzeau2020-05-111-0/+46
| | | | | | | | | | | | | | | Uses a timestamp file in the build directory to detect when the input changes using DEPENDS from add_custom_command. Total copied files size sum up to more than 260 MB. This was copied at every incremental build, even if nothing changed. This leads to faster build, especially when the copied files are not cached in RAM or when not using a SSD. Change-Id: I3a0b691b961e1d8591068bacf40ae2467c8637cf Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-111-0/+4
|\ | | | | | | Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
| * CMake Build: Set BUID_WITH_PCH to OFF if CMake version less 3.16Cristian Adam2020-05-071-0/+4
| | | | | | | | | | Change-Id: I11a58cf2e67272b9d45a877dfa20c089706cfc2a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-061-0/+167
|\ \ | |/ | | | | Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
| * CMake build: Make translation function available to external pluginsEike Ziller2020-05-051-0/+167
| | | | | | | | | | | | | | And fix that the "ts_all" target did not get the custom target prefix. Change-Id: Iff6a5e328456f3d949c31f2e41b48c400fad773c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | CMake Build: Fix for building with Qt6Cristian Adam2020-04-291-1/+1
| | | | | | | | | | | | | | Qt5: :moc target is being used, and it had no alias. Change-Id: I1350507b14089d70c64ed6632e6dcce8c4881f0f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-281-6/+5
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
| * Bump versionEike Ziller2020-04-281-2/+2
| | | | | | | | | | Change-Id: Ieb662d20d5bba2e410039bcdeb2459129601187a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * CMake build: export less generic public includesEike Ziller2020-04-241-6/+5
| | | | | | | | | | | | | | | | | | Do not put every plugin's and lib's source folder into public includes. We require includes of the style <somelib/foo.h> and <someplugin/bar.h> if someone depends on somelib or someplugin. Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-241-1/+5
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakekitinformation.cpp Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
| * CMake build: Fix devel package issuesEike Ziller2020-04-231-1/+5
| | | | | | | | | | | | | | | | | | Include paths and headers were missing for building a separator Qt Quick Designer plugin. Task-number: QTCREATORBUG-23778 Change-Id: Ib6ba96ad42a8b2b36e0ee2f0e3c51c27f3365d37 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-142-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
| * CMake build: Support QTC_PLUGIN_REVISIONEike Ziller2020-04-091-0/+1
| | | | | | | | | | Change-Id: Icc3735b9b7d0d1fa8a9e8695da3cb39275b96219 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Bump version -> 4.12.0Eike Ziller2020-04-081-3/+3
| | | | | | | | | | Change-Id: I6894b5b095393981d9d42569ad43024e40711f94 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Bump master->4.13.0-beta1Eike Ziller2020-03-201-3/+3
|/ | | | | Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump versionEike Ziller2020-03-191-3/+3
| | | | | Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.12 beta2Eike Ziller2020-03-061-3/+3
| | | | | Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Less file creating during configureCristian Adam2020-03-021-11/+10
| | | | | Change-Id: I263853f0a903d81a8d869bc4f5683e1a1b0078e2 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake Build: Fix yaml-cpp include directory detectionCristian Adam2020-02-261-0/+5
| | | | | | | | On Ubuntu 19.10 the libyaml-cpp-dev CMake config module has a broken value for YAML_CPP_INCLUDE_DIR. Change-Id: I5097ef656b988dda0326a15b521b92cbbdb0a390 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake Build: Add qtdiag to Dependencies install targetCristian Adam2020-02-262-1/+24
| | | | | Change-Id: If1c56ff6e366ec4d5c4bb97e4a176cf9cf8dc4c5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMake build: Add a qtc_glob_resources functionAlessandro Portale2020-02-241-0/+13
| | | | | | | | | This is the CMake equivalent of "RESOURCES = $$files()" from qmake. Use it in StudioWelcome for the Qml resources. Change-Id: I2f495e2c4bad9f0bb488dee7e8966e31acb51b5a Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* GitHub Actions: Fix MSVC CDB debuggerCristian Adam2020-02-191-0/+13
| | | | | | | Install the VC Runtime for the qtcreatorcdbext component Change-Id: I22a7620be51acca53313bcac4b54746214d7b13f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMake Build: Set CXX_EXTENSIONS to OFF for QtCreator pluginsCristian Adam2020-02-191-0/+3
| | | | | | | | | This makes sure that if you have a plugin and set the C++ standard to 14, but forget to set CXX_EXTENSIONS to OFF you don't get weird PCH compilation failures. Change-Id: I66edf6431624f667ba400e8ef79f2ad6170e3ca2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Do not set suffix for qtcreatorcdbext dllCristian Adam2020-02-191-2/+2
| | | | | Change-Id: Id0b5692df1661fe1e20b77d1e538c01fbb974b5e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Skip PCH for targets that do not have QT_NO_CAST_TO_ASCIICristian Adam2020-02-141-0/+6
| | | | | | | One example is perfparser_lib. Change-Id: I63f20dcba3aedbc8fbf948d30980baf6afd8c110 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Add CMAKE_PREFIX_PATH to the HINTS paths for elfutilsCristian Adam2020-02-131-2/+2
| | | | | Change-Id: I0d4a8974c943a33e538ee2412258401e89ea3c1f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Exclude Dependencies component from ALLCristian Adam2020-02-132-0/+5
| | | | | Change-Id: Iedc69399ec2983ecd3359969bf80bdcdfafad37a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix libexec path on LinuxEike Ziller2020-02-131-1/+1
| | | | | | | It's just libexec/qtcreator/ without a trailing bin/ Change-Id: I96015dc5c3bb023dabd5b64f1bb9f83bd85b4d51 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake Build: Use install component DependenciesCristian Adam2020-02-122-5/+9
| | | | | | Fixes: QTCREATORBUG-23593 Change-Id: If9861a0ee09f2ce12ac093c2fde600a77958723a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Put wininterrupt and cdbextension into separate componentsEike Ziller2020-02-111-4/+56
| | | | | | | | And make it possible to turn off building the cdbextension library. So they can be installed and packaged separately Change-Id: Ic7da1411aa3973604b897e1cbf57ad9c5b0fe460 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Core: Turn the IDE revision link in VersionDialog to be Opt-inAlessandro Portale2020-02-101-3/+0
| | | | | | | | | If IDE_REVISION is set, don't default to some hardcoded string for IDE_REVISION_IDE_STR. Task-number: QTCREATORBUG-23524 Change-Id: Icc6aa6a4a0fb24178c5c1bd5feaa96b6a5b07115 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-02-071-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
| * Bump version to 4.11.2 and copyright year to 2020Eike Ziller2020-02-061-3/+3
| | | | | | | | | | Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake Deployment: Move creation of qt.conf to add_qtc_executableCristian Adam2020-02-063-65/+70
| | | | | | | | | | Change-Id: Icbeed128cc99b077aad925f278aaf9534d3f9fec Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Deployment: Remove Dependencies componentCristian Adam2020-02-062-0/+251
| | | | | | | | | | | | | | | | | | - Install will also copy the dependencies. - Made the dependencies search recursive, not just two steps - Moved install code to a script, not having to escape quotes and dollars Change-Id: I6c5fb19e4094e9dcd4b339d5b90be6e7c5055223 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Deployment: Fix deployment / rpath handing on LinuxCristian Adam2020-02-061-6/+16
| | | | | | | | | | Change-Id: Ic8eb8665e4ac43a49ecbf07f2a92873453c9faca Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Build: Brought back GoogleTest unittestCristian Adam2020-01-311-1/+1
| | | | | | | | | | | | | | | | It was removed by accident from ctest, and it was not ran on GitHub Actions. Change-Id: I044bc5fc96e71211982c07c8796974e97fff5737 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Build: Add include guards for QtCreatorAPICristian Adam2020-01-311-0/+5
| | | | | | | | | | | | | | | | Commit e8fceb821e3e18ba2d2230c02b6e0cd31d119d03 re-includes the file, and things go bad. Change-Id: Ifad79824f1a64459cd01337656b1a1300f49d06b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake Build: Add Dependencies install targetCristian Adam2020-01-301-0/+33
| | | | | | | | | | Change-Id: I17f8d26500a9a75bef64e23c3b64492c1bb929cc Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake: Fix DesignerComponent detection for MSCV/debugAlessandro Portale2020-01-281-1/+1
| | | | | | | | | | | | Change-Id: Ia5e7a26891f062d040dcfd9a395c5e1b4cbaf321 Hack: Also search for "d" versions of the library. Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake Build: set a 5s timeout per testCristian Adam2020-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | At the moment MinGW build is running for 5 hours because a test hangs. The test suite should finish the 2700 tests in 120 seconds. Change-Id: I71e2e740f916bb304c91a6a3054ae097b4076543 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake Build: add perfparserCristian Adam2020-01-282-5/+96
| | | | | | | | | | Change-Id: Ib16548befefbb827f2752300f9e67da3cf91570c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Core: Let the clickable link in VersionDialog jump to git logAlessandro Portale2020-01-241-1/+1
| | | | | | | | | | | | | | ...instead to just one commit. Change-Id: I8bb53ba3e7f4fcfb2fb306afe2a06a2b63dc89d8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
View Lorry Controller Status