Commit Graph

169 Commits

Author SHA1 Message Date
Cristian Adam
f90f60bb32 CMake: Fix QTC_STATIC_BUILD
Change-Id: Idfcd36f2d5fdaf09c958ff101aa5e83e0a29cb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 10:11:18 +00:00
Tim Jenssen
1a3a8ecc96 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Id242ab4ca485527defdcc1555d204e12e50ddb7a
2023-09-14 17:37:24 +02:00
Marco Bubke
9e60df9f7f CMake: Silence warning in third party code
Adding SYSTEM_INCLUDE for which you get no warnings. Fix
PUBLIC_SYSTEM_INCLUDE to work for all cases where PUBLIC_INLCUDES works.

Change-Id: I7059c2879004743c13c368220596081dd054407a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-07 08:53:43 +00:00
Christian Kandeler
fb4177a540 cmake build: Set the WITH_TESTS macro also in the tests themselves
Otherwise plugin and test code might parse header files differently.

Change-Id: I0243a7780b7095a4c518da26cc3cf23fd9f76cf5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-31 13:05:04 +00:00
Cristian Adam
8642dd3b68 CMake: Fix build for Windows
The `env_with_default` function is part of Utils.cmake, which would need
to be deployed. But it can't be part of QtCreatorAPIInternal.cmake due
to its usage before the inclusion of QtCreatorAPIInternal.cmake in the
main QtCreator CMakeLists.txt file.

A sepparate function needs to do the task.

Amends 1036c776f5

Change-Id: I95344dd98c5fa0258303ed8d02855584a1945144
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-17 07:55:11 +00:00
David Schulz
1036c776f5 CMake: add environment variable for ccache support
Add another environment variable whether CMake should check for ccache
and adjust the compiler options accordingly when building Qt Creator.

Change-Id: I796f29d7f6ad4a1f054f978d50dbd0120b873aea
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-16 07:29:09 +00:00
Marcus Tillmanns
973f74bad3 Tests: Add NEEDS_GUI flag to add platform argument
Tests that create a QApplication need to be started with
"-platform minimal" so that they won't fail on build servers
without Display.

This also keeps them from distracting you if you run them while working.

Change-Id: I05df258b2204a3abd3cdea446d6a52f3e57a4a62
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-10 12:15:12 +00:00
Eike Ziller
a419670ff5 Build: Change plugin json.in files to CMake style
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.

Adds a fatal message if it detects the old style in a .json.in file for
easier porting.

Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:21:16 +00:00
Eike Ziller
b11a6900e6 Build: Remove feature from the olden times
We don't set this to anything else anymore, so remove the option to set
it.

Change-Id: I9e2aced8909d557e3a4f0b8ca8fff70ac6ec2e1d
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>
2023-07-25 12:28:33 +00:00
Cristian Adam
0dbc208a07 CMake: Add -fPIC also for OBJECT libraries
add_qtc_library would have set the POSITION_INDEPENDENT_CODE property
for STATIC libraries on UNIX based systems.

The OBJECT libraries need the same treatment.

Change-Id: Ia333a36ea0f35d7db3ed876cdde5b895b47644c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 12:49:05 +00:00
Tim Jenssen
adb664f521 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/libs/utils/filepath.cpp
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/unit/unittest/CMakeLists.txt

Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
2023-03-30 13:30:42 +00:00
Eike Ziller
b36287731e Merge remote-tracking branch 'origin/10.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
	src/tools/perfparser

Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
2023-03-29 12:21:50 +02:00
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Eike Ziller
d99128e5e6 Build: Fix CONDITION with multiple parts
for add_qtc_test and qtc_add_resources.
The condition needs to be wrapped in () because otherwise conditions
that contain AND or OR themselves break.

Change-Id: Iff64ad15c5f5b6e5a9db5a97c975bd8854c59c02
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-23 12:10:34 +00:00
Eike Ziller
c7e94d80c7 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	src/shared/qbs

Change-Id: I33e13270c8c15a51b4ce4eaa6b4584041ed124e0
2023-03-13 12:30:04 +01:00
Marcus Tillmanns
67f7968e9b CMake: Add feature info for executables
Change-Id: I4cfa2168b6e03730c02ca089f3c6f86fc07a6a01
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-12 09:24:15 +00:00
Eike Ziller
d686d241d2 Build: Avoid installation of huge static QmlDesignerCore library
It is not used as a public interface, just to share with tests. Do not
install it.

Fixes: QTCREATORBUG-28673
Change-Id: I669ffd468291b8150568d0193a33e5795d58f017
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-03-07 14:23:02 +00:00
Marco Bubke
121e300527 cmake: Add PROPERTIES to add_qtc_test
Change-Id: I66d4437866ae2b107fede78760284dc35a1fb8f0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-02-16 12:27:24 +00:00
Eike Ziller
a89d1e5958 Build: Don't add QT_RESTRICTED_CAST if QT_NO_CAST is already set
as directory property.
It is not allowed to set both, but perfparser adds QT_NO_CAST_FROM_ASCII
as a directory property now.

Change-Id: I6dbc8911521c737dd38c58777b8cd785e8cfe135
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-25 15:04:47 +00:00
Eike Ziller
06c4df37b9 CMake build: Remove usages of Qt5_VERSION
and remove checks for Qt < 6.2, since that is our minimum version.
Except for sdktool and qml2puppet.

Change-Id: Id36cd1a15a5a6e5480e4ae5d0a8ffaea4b2a1864
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>
2023-01-24 15:35:46 +00:00
Eike Ziller
55fa109b59 CMake build: Use version-less Qt targets
Since we do not support Qt < 5.15 anymore, and as a first step
for getting rid of our special FindQt5.cmake.

Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-01-05 10:13:16 +00:00
Tim Jenssen
98a40b3690 CMake build: Make errors of execute_process fail the build
Instead of silenty failing and resulting in broken builds/packages.

The property is only available since CMake 3.19, so limit the feature to
that.

Change-Id: I82b06e78540e81a809f7fdfe130648becfc9672e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-28 08:29:42 +00:00
Marcus Tillmanns
66eca4cb4b CMake: Fix WITH_SANITIZE
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>
2022-09-20 10:17:31 +00:00
Eike Ziller
b338405477 Require Qt 6.2 for building Qt Creator
Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2022-07-11 13:36:18 +00:00
Eike Ziller
f950a5d86c Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd
2022-07-07 13:47:12 +02:00
Eike Ziller
d059a610b1 COIN: Arm auto tests
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>
2022-07-05 10:13:18 +00:00
Eike Ziller
c7b724c4ca Merge remote-tracking branch 'origin/8.0'
Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
2022-06-27 10:33:44 +02:00
Eike Ziller
ff96ea41b2 CMake build: Don't exclude GTEST tests for dependency checking
Also Googletest based tests should be disabled if dependencies
are missing.

Amends aac0f2a8f5

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>
2022-06-27 07:05:59 +00:00
Tim Jenssen
97da8a6b5b add CONDITION support to extend_qtc_target
Change-Id: I4d675170386373af14a143cac9c4cef817d0585c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-06-20 16:51:12 +00:00
Cristian Adam
19f5b835de CMake: Ensure qtcreatorcdbext is a shared library for all cases
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>
2022-05-03 14:56:02 +00:00
Cristian Adam
88781a003f CMake: Qt Creator Static build support
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>
2022-04-29 07:16:53 +00:00
David Schulz
ca7a18568c CMake: add ccache option
Change-Id: I482b0f3ac372f141e465b72fbcca9d8b5c5b352d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-04-11 12:29:26 +00:00
Eike Ziller
c84380cdc8 Merge remote-tracking branch 'origin/7.0'
Change-Id: Ib2267ddbb702564a6e1c8f6b1db802bc9c45759d
2022-03-31 15:32:42 +02:00
Orgad Shaneh
30bb32d9af CMake build: List json.in files for plugins
Change-Id: Ia62e267d97ff225b94fe77da37af4e8fbc5f54b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-03-31 08:35:31 +00:00
Thiago Macieira
46f6c5d005 CMake: require no undefined symbols
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>
2022-03-02 20:03:46 +00:00
Cristian Adam
47667772c7 CMake: Enable higher compiler warnings for building Qt Creator
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>
2022-02-25 09:54:49 +00:00
Christian Stenger
1652be1310 Tests: Provide some cmake files for manual tests
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>
2022-02-15 08:21:40 +00:00
Eike Ziller
3ba00ac39f CMake build: Allow adding RPATHs via CMAKE_(BUILD|INSTALL)_RPATH
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>
2022-02-10 16:32:42 +00:00
Eike Ziller
1221552377 Require CMake 3.16 and remove workarounds
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>
2022-02-02 08:55:31 +00:00
Eike Ziller
9d8a419d10 Remove qmake build files
Removes qmake as a build system for building Qt Creator itself.
Keep them for some tests that are not completely moved to CMake yet.

Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 12:18:15 +00:00
Eike Ziller
33f2074272 Bump requirement to Qt 5.15.2
Qt 5.15.2 includes API that makes transitioning to Qt 6 easier.
We currently have workarounds for Qt 5.14 in place that we can
remove when requiring 5.15.2, and we also can stop adding workarounds
for new code.

Change-Id: I920fdccc41d755a6ad39cb5161cd916999fee755
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-17 10:20:32 +00:00
Eike Ziller
85b60d9608 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
2021-12-16 10:50:33 +01:00
Cristian Adam
1b1527b64f CMake: SKIP_DEPENDENCY for gtest_add_tests for unittest
Without SKIP_DEPENDENCY the source files would be treated as cmake
list files, which meant that for every source change cmake would
have been rerun.

Change-Id: Icc087fa951fa7e7aee25504367b6146e66bf9dcb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-12-14 09:54:31 +00:00
Cristian Adam
06b967df50 CMake: Remove uneeded auto moc related rebuilds on done builds
When running cmake after a build was done on Windows with MSVC will
get more files to build:

[1/15 9.0/sec] Running utility command for copy_python_dll
[2/15 3.6/sec] Automatic MOC and UIC for target ProjectExplorer
[3/15 2.2/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\sessiondialog.cpp.obj
[4/15 2.9/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\codestylesettingspropertiespage.cpp.obj
[5/15 3.6/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\editorsettingspropertiespage.cpp.obj
[6/15 4.1/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\projectexplorersettingspage.cpp.obj
[7/15 4.6/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\sessionmodel.cpp.obj
[8/15 5.1/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\customparserconfigdialog.cpp.obj
[9/15 5.2/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\projectwizardpage.cpp.obj
[10/15 3.4/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\ProjectExplorer_autogen\mocs_compilation.cpp.obj
[11/15 1.6/sec] Building CXX object
src\plugins\projectexplorer\CMakeFiles\ProjectExplorer.dir\projectexplorer.cpp.obj
[12/15 1.6/sec] Linking CXX shared library
lib\qtcreator\plugins\ProjectExplorer.dll

When adding "-d explain" to the build parameters ninja would print:

ninja explain: restat of output
src/plugins/projectexplorer/ProjectExplorer_autogen/timestamp older than
most recent input
src/plugins/projectexplorer/.rcc/generated_testdata.qrc.in
(6611078583964975 vs 6611078835307007)
ninja explain:
C:/Projects/QtCreator/build-repo-Desktop_Qt_5_15_2_MSVC2019_64bit-Release/src/plugins/projectexplorer/ProjectExplorer_autogen/mocs_compilation.cpp
is dirty

Change-Id: Iaa00478bb6d81f7235d25ad541fbf86c7ca593f6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-12-14 09:53:39 +00:00
Ulf Hermann
3b7453e3ed CMake: Generate metatypes for all libraries
We need them for any QML modules that use types from any libraries.

Change-Id: Ia9e992db39d70f74ab15e7e25ed4bbabf7524e42
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-12-13 18:14:24 +00:00
Cristian Adam
7a0bdccadf CMake: Remove debug list source files comparison
This was needed in the early days of the CMake port when the list of
source files would change due to being added to the qmake project
files.

Change-Id: I7afd219b24ab7a0d87fce26ba35dac75cf8caa5b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-29 10:34:18 +00:00
Joerg Kreuzberger
efdaeaba43 Add option to build QtCreator with sanitizer
Fixes: QTCREATORBUG-26318
Change-Id: I44589b5bb39958eda2329b444e4857e8f61823bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-05 09:03:41 +00:00
Eike Ziller
ea1655881d CMake build: Force -fPIC for static libraries on UNIX
Usually that is done by Qt, but not if reduce_relocations is off.

Fixes: QTCREATORBUG-26435
Change-Id: Idd337d59555fd6e732215b9c753820672f63c91f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-21 08:33:31 +00:00
Cristian Adam
be2466dfa7 CMake: Remove major version number dll suffix
This was done to have qmake parity when we compared the qmake and cmake
release builds.

Since we are past that now, and the cmake build is the one used to do
releases, we can drop the number from the dlls.

Change-Id: I60d1b368daf4258884c239204c2e3c18f244e930
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-10 12:43:19 +00:00
Eike Ziller
0b7cd967a2 CMake build: Fix pdb file names (Windows)
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>
2021-08-10 12:23:16 +00:00