aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 5.0.3Eike Ziller2021-10-061-2/+2
| | | | | Change-Id: Iba72b6b0ff1d13a35b6d7473b0617ecb80afa164 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Work around Qt6::ATSPI2_nolink issueJoerg Bornemann2021-10-051-1/+2
| | | | | | | | | | | | | | | | | | This works around QTBUG-97023. When building the Qt Creator super repo against the installer-provided Qt 6.2.0 on Linux, Qt6Gui creates an imported library target named Qt6::ATSPI2_nolink. This one must also be promoted to global scope. Otherwise, subsequent find_package(Qt6 COMPONENTS Gui) calls fail with Some (but not all) targets in this export set were already defined. Targets Defined: Qt6::Gui;Qt6::GuiPrivate Targets not yet defined: Qt6::ATSPI2_nolink Add Qt6::ATSPI2_nolink to the components that are promoted and aliased. Change-Id: I39c46e8f1c831e2fad2aa4e928b785da08a0407c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 5.0.2Eike Ziller2021-09-171-2/+2
| | | | | Change-Id: Ia919fb9c976025000609033ed61ecb1c2fe71f7a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add branding option for application icon and logoEike Ziller2021-09-081-0/+7
| | | | | Change-Id: I23ee91ab47d06aab370b2083d4f96f7833bf16ff Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump version to 5.0.1Eike Ziller2021-08-271-2/+2
| | | | | Change-Id: Ic4daa60f1cb55a15a6885292cf2928910ae3f563 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* macOS: Exclude CMAKE_PREFIX_PATH when searching for dsymutilEike Ziller2021-08-191-1/+3
| | | | | | | | dsymutil is shipped with libclang, but we usually don't want to use that. Fixes universal builds while we don't have a universal build of libclang yet. Change-Id: Ie5c435e1c391f7bb0a8f1faadbb7b3375d101990 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* UnitTest: Adapt to Google Benchmark v1.5.4Orgad Shaneh2021-08-181-0/+1
| | | | | Change-Id: I2c2a34206dbc01d277242f5d736eef3e1333b01f Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Bump version to 5.0.0Eike Ziller2021-08-131-3/+3
| | | | | Change-Id: I1203dd71cc2f1e6d1f435dbfdc07376130fbb61f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix pdb file names (Windows)Eike Ziller2021-08-101-0/+2
| | | | | | | | | They should have the same base name as the DLL/.lib, but were missing the version number. Fixes: QTCREATORBUG-25968 Change-Id: I30e39a62b94264bd5a4852f0b1100044fa47d811 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Bump version to 5.0 RC1Eike Ziller2021-07-161-3/+3
| | | | | | | Skipping Beta 2 due to summer slothfulness. Change-Id: If3ee6c1c218b17d413d2f28023b9fb094a969cdd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Make it possible to run ts_* targets with Qt 6Eike Ziller2021-07-142-2/+2
| | | | | | | | Alias for lupdate for missing Change-Id: I8a9a68e6d3be54ab8e1d143d3611e9d8da6d760d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 5.0 beta2Eike Ziller2021-07-121-3/+3
| | | | | Change-Id: Ie8a9f5be343d5aa939b9ec54e549c604d05d223f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix workaround for new *Private targets with CMake < 3.18Eike Ziller2021-07-071-0/+1
| | | | | | | | Amends a803d04c171b31ec90c1ea2bb82930a967027ec8 Change-Id: I2df067d988a79845f4a9f85485c13e5e2f8019dc Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake build: Purge copying settings from Nokia directoryOrgad Shaneh2021-07-051-1/+0
| | | | | | | It is not used, and not supported in the other build systems. Change-Id: I38049e145595490058e255b94cdb8dd13c3f6fb2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Don't re-link libraries unnecessarilyEike Ziller2021-07-051-0/+4
| | | | | | | | | | | If a library changes its implementation only, don't relink all libraries that depend on it. This is usually not necessary since the API stayed the same. Fixes: QTCREATORBUG-25962 Change-Id: I0221b09afd92463c3dad40bd0107ba0d5668ac79 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Fix compilation build with older CMake versionsCristian Adam2021-06-291-1/+1
| | | | | | Change-Id: I86dbff49cf5d00bf75d2e32154db2d3d254e2b17 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMakePM: Add support for qtc_runnable featureCristian Adam2021-06-251-1/+6
| | | | | | | | | | | This will allow for the Qt Creator's CMake build only qtcreator target to be selected as runnable. Similar to qmake's qtc_runnable or Qbs's qtcRunnable features. Fixes: QTCREATORBUG-25908 Change-Id: I6416873d0ad9cfec4960d98fc4b289ec98cc58b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.15' into 5.0Eike Ziller2021-06-242-8/+28
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/projecttreehelper.cpp src/plugins/coreplugin/mainwindow.cpp Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee
| * CMake build: Force optimization of CPlusPlus libEike Ziller2021-06-222-8/+28
| | | | | | | | | | | | | | | | | | | | | | Even in the debug build, as done for the qmake build system. This is for performance optimization of this critical part for C++ parsing even in debug / developer builds. Change-Id: I9552ba9fc44e213f2df1d2d2a64a126af3603fd1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | fix Qt6.2 buildsTim Jenssen2021-06-221-10/+11
| | | | | | | | | | | | | | | | use foreach to be prepared for the future Change-Id: I9157bb04479ff2376a567380c76c38b9aee900b7 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | CMake build/Qt6.2: Avoid message about missing DesignerComponentsEike Ziller2021-06-181-4/+9
| | | | | | | | | | | | | | | | Amends 77fd87a545e2c3374b252603ad9da6e029f42f99 Change-Id: I237a3f0b146f9fe5e2db1e1e4eb943a90fbd8db8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | fix Qt 6.2 buildTim Jenssen2021-06-171-0/+5
| | | | | | | | | | Change-Id: I426879c9ac8e1db84a39789d00e73498216e089c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | unittest: Add missing tests (QmlDesigner, ClangTools and a few others)Eike Ziller2021-06-171-1/+4
| | | | | | | | | | | | | | | | | | | | Ups it to 2487 tests from 110 test suites. (from 1963 tests from 91 test suites) Change-Id: Id601bc8bbd43f129956be812e30a94081098c3cb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-06-161-1/+1
|\| | | | | | | | | | | | | Conflicts: coin/instructions/common_environment.yaml Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
| * cmake: fix `Qt6Core5Compat` detectionTim Blechmann2021-06-161-1/+1
| | | | | | | | | | Change-Id: I6de4de1f20b4e611f632ee515cfdf5243f2d16ba Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 4.15.2Eike Ziller2021-06-101-2/+2
| | | | | | | | | | Change-Id: Ida5406673616350ad6656533de179342ab320171 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake: Add BUILD_TESTS CMake variable to filter tests to buildCristian Adam2021-06-111-0/+14
| | | | | | | | | | | | | | | | | | This allows building one test: -DBUILD_TESTS=tst_my_test, this will set BUILD_TESTS_BY_DEFAULT to OFF (default value is ON) and set BUILD_TEST_TST_MY_TEST to ON. Change-Id: I7800f3d238121725bb9fa4146f76ddcd2b10bde9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Revert "CMakePM: Filter test also by BUILD_EXECUTABLES list"Eike Ziller2021-06-111-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 99396421de06f09f8532baad3303ec6dd0ee96fe. The patch does not solve the use case (building Qt Creator without tests and then only building individual tests), and has lots of side effects like tests landing in the application bundle on macOS and in bin on Windows, and tests being installed. Change-Id: I593627b55577e13a3d2cf1758deac99efa521954 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMakePM: Filter test also by BUILD_EXECUTABLES listCristian Adam2021-06-101-15/+10
| | | | | | | | | | | | | | This way one can build only one test. Change-Id: Iebf9686108988793193106ebed312f7e86ee2e61 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMakePM: Only build unittests if clang package is foundCristian Adam2021-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | If the clangTooling target is present then QTC_CLANG_BUILDMODE_MATCH will be set to ON. If QTC_CLANG_BUILDMODE_MATCH is OFF then unittest will not be build. Change-Id: Ifacbec82734efa58cc8d7c680bd1ac957cac2dc6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-06-091-1/+4
|\| | | | | | | Change-Id: I07ac7113947cae2e7c3e51b8fa95563fe02b3dc8
| * CMake build: Add files from qtc_copy_to_builddir to treeEike Ziller2021-06-071-1/+4
| | | | | | | | | | | | | | | | | | Make the files from qtc_copy_to_builddir part of the project tree, so they get included in searches etc. Change-Id: I191f88c8520b9e4a16fd6a5acfeda9cf880cea89 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | CMake build: Fix extend_qtc_testEike Ziller2021-05-281-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extend_qtc_test should gracefully do nothing if the test was declared, but disabled for any reason. add_qtc_test failed to add the test to the list of declared tests, if dependencies were missing, so extend_qtc_test was complaining that the test didn't exist in that case. add_qtc_test must always add the test to the list of declared tests, and extend_qtc_test must only fail if the test was never declared, but do nothing if the test target does not exist (because the test was disabled for some reason). Change-Id: I414a169e3e23c3c0e11c11e2ee86effa706b545c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | CMake build system: Fix error message in extend_qtc_testAlessandro Portale2021-05-271-1/+1
| | | | | | | | | | | | | | Print out "${target_name}" Change-Id: I6978856bfe010cdfc934260db1a3490a1329eb6a Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake build: Gracefully handle turned off target in qtc_add_resourcesEike Ziller2021-05-261-0/+4
| | | | | | | | | | | | | | | | Otherwise qtc_add_resources fails when turning off corresponding BUILD_.... flags, or needs to be wrapped with "if(TARGET ...)" everywhere. Change-Id: I34e230569ab9619b1c107404bf2fdf8e8e86bd7e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-05-251-0/+2
|\| | | | | | | Change-Id: I3d3dfa04124eed14952294c2847b9851dcb1a5fd
| * CMake: Fix build with MSVC 2019 and Qt 6.2Cristian Adam2021-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 6.2 requires __cplusplus preprocessor set to at least 201703L According to https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus one needs to add the compiler flag /Zc:__cplusplus CMake doesn't set the flag, there is an issue opened at https://gitlab.kitware.com/cmake/cmake/-/issues/18837 This flag is passed to any target that links to Qt6::Core, unless the flags are not manually copied for some reason. Task-number: QTCREATORBUG-25730 Change-Id: I271e85fe857b5d4ac8980f77c723e5704a8eb743 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Bump version to 4.15.1Eike Ziller2021-05-051-2/+2
| | | | | | | | | | Change-Id: Ibc2b495f00d33ec9c0c1400c9378cd80d95e11f3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake build: put .lib files next to .dll files for librariesEike Ziller2021-05-202-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | - there is no reason for putting them elsewhere - since CMake file-api only reports the .lib location for linked libraries, Qt Creator has difficulties with adding the correct PATH for running e.g. manual tests, when the .lib files are at an arbitrary location Fixes: QTCREATORBUG-25684 Change-Id: I24b26a79c70fd5384f534f8f0b66b51fca1ecc56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Enhance qtc_add_resources with CONDITIONEike Ziller2021-05-111-1/+8
| | | | | | | | | | | | | | | | | | like most other functions Amends 201786d3fc39f92cec4ad9eafa548e534e5cc442 Change-Id: Id35b9730dd6c9b55e80b99068a8ec98d30538705 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-05-051-0/+4
|\| | | | | | | Change-Id: I75ffc79eeb8d73296a2271a636fae48e35427947
| * CMake: Ensure test defines are present for tools as wellChristian Stenger2021-04-301-0/+4
| | | | | | | | | | | | | | Fixes the sdktool auto test. Change-Id: I9e1779dc17a0cb79131e17182290255aed2f7d0e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-04-262-0/+20
|\| | | | | | | Change-Id: I44dad4bbe9ed955d35c713485720a3f36a21874d
| * COIN: Add hack to support debug info with sccache and MSVCEike Ziller2021-04-262-0/+20
| | | | | | | | | | | | | | | | | | | | | | sccache does not support the "/Zi /FS" option for debug information with MSVC. Optionally replace "/Zi" by "/Z7", which leaves debug information in the object files and only collects it at link time. See also qtbase 2354274f39934b94383923834479901106489def. Change-Id: Id94c2116f3c4192556dbdf8fe82b12ce0a204273 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Bump version to 4.15.0Eike Ziller2021-04-141-3/+3
| | | | | | | | | | Change-Id: Idba4da565319c5b23e781f26fb1cf68722abbede Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-04-064-21/+48
|\| | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I403b236c40d73a61ae22304e289e9d4374366395
| * CMake build: Fix remaining issues with Devel packageEike Ziller2021-04-063-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Linux (and Windows) we should not create toplevel files (README.md etc) or directories (doc/, scripts/ etc). On macOS, move the whole Devel package contents into the app bundle, because that is installed toplevel in the Qt installers, and we shouldn't even create include/, lib/ or any other directory at the toplevel at all. Since the prefix path must now point to the Resources folder inside the app bundle, adapt build_plugin.py to also accept --qtc-path pointing to the app bundle (Qt Creator.app) itself, and also to the app bundles parent directory. Adapt the Qt Creator plugin project template similarly. Task-number: QTCREATORBUG-25414 Fixes: QTCREATORBUG-25415 Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * crashpad: fix windows builds + show settings checkboxTim Jenssen2021-03-291-9/+10
| | | | | | | | | | | | | | | | coreplugin/CMakeLists.txt uses BUILD_WITH_CRASHPAD and not the old not existing variables Change-Id: I5ad9ebb3cf0ac1ee06d53a1e276d70a194b0ace4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * cmake build: Disable PCH for CMake < 3.18 with GCCEike Ziller2021-03-251-2/+4
| | | | | | | | | | | | | | | | https://gitlab.kitware.com/cmake/cmake/-/issues/20119 was fixed in CMake 3.18. Change-Id: Iad335e8c7a70069404f5c80bb3b65c0d52f82393 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Bump version to 4.15.0-rc1Eike Ziller2021-03-251-3/+3
| | | | | | | | | | Change-Id: I522a8c88d636bcc09de2be0b2aa4f47a1c080ac9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 18:41:53 +0000