Commit Graph

32457 Commits

Author SHA1 Message Date
Ben Leadbetter
8bd98b8117 Genex: Fix TARGET_BUNDLE_DIR_NAME incorrect extension
Fix the genex from commit 997af2e1a6 (Genex: Add TARGET_BUNDLE_DIR_NAME,
2022-04-14, v3.24.0-rc1~233^2) to use the correct bundle directory
extension for each bundle type.

Fixes: #23683
2022-07-01 08:18:10 -04:00
Brad King
6bc597b30e Merge topic 'file-set-crash' into release-3.24
3fee5398bd install(EXPORT): Check for missing file sets at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7420
2022-06-30 08:20:23 -04:00
Kyle Edwards
3fee5398bd install(EXPORT): Check for missing file sets at generate time
Missing file sets were originally checked at configure time in
install(TARGETS ... EXPORT), but were not checked at generate time. If
a file set was added after install(TARGETS ... EXPORT) was called,
an abortion error was thrown. Check again at generate time to gracefully
display an error message instead of crashing.

Fixes: #23680
2022-06-29 15:05:32 -04:00
Brad King
18c0ff66b2 Merge topic 'fix-23523' into release-3.24
10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7419
2022-06-29 08:43:27 -04:00
Josiah Bills
10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files
For every file foo.ui we generate a ui_foo.h file in
${target}_autogen/include or ${target}_autogen/include_$<CONFIG> in the
multi-config case.  Even .ui files in subdirectories are handled this
way.  That means, .ui files with the same base name will conflict in a
target.

However, for .ui files in subdirectories we added generated sources with
the nonexistent path ${target}_autogen/include/subdir/ui_foo.h.  This
patch fixes that.

Also, CMake will now yield an error if a target has multiple .ui files
with the same base name.

Fixes #23523
2022-06-28 17:26:28 +02:00
Brad King
8c562ece28 CMake 3.24.0-rc2 2022-06-23 10:58:01 -04:00
Brad King
9a0a94fdaa VS: Add variable to to turn off Visual Studio compile batching
Extend the change from commit b764c7c273 (VS: Add property to turn off
Visual Studio compile batching, 2022-02-07, v3.24.0-rc1~710^2) by
adding a variable to initialize the property on every target.

Issue: #23179
Fixes: #23639
2022-06-22 12:07:03 -04:00
Brad King
dc67ae7cd3 Merge topic 'use-arm64-msbuild' into release-3.24
80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7381
2022-06-22 08:48:32 -04:00
Tommy Vercetti
80273514aa VS: Prefer ARM64 MSBuild on Windows ARM64 host
Fixes: #23629
2022-06-21 10:56:42 -04:00
Gregor Jasny
116cc5a57b cm_cxx_features: filter out warnings from Xcode 14
```
xcodebuild[13070:54426] [MT] DVTSDK: Warning: SDK path collision for path
```
2022-06-21 10:48:37 -04:00
Brad King
3b4bd019ff CMake 3.24.0-rc1 2022-06-14 12:11:11 -04:00
Brad King
c1957df97a Merge topic 'lcc-warnings' into release-3.24
beb07cdda7 Source: Convince LCC that RAII variables are used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7357
2022-06-14 07:35:20 -04:00
Brad King
beb07cdda7 Source: Convince LCC that RAII variables are used
Extend the change from commit 5ad8862318 (Source: Convince NVHPC that
RAII variables are used, 2021-04-26, v3.21.0-rc1~254^2~1) to apply to
LCC too.
2022-06-13 11:07:35 -04:00
FeRD (Frank Dana)
98a10290a8 cmSystemTools: Fix 'ErrorOccurred' spelling
Rename the booleans 's_ErrorOccured' and 's_FatalErrorOccured' to
's_ErrorOccurred' and 's_FatalErrorOccurred', respectively.

Rename the getters and setters to 'Get[Fatal]ErrorOccurred' and
'Set[Fatal]ErrorOccurred', and fix all uses across the codebase.
2022-06-13 09:05:24 -04:00
Brad King
f0ebdce4e8 Merge topic 'cmake-gui-qt6-decode' into release-3.24
497397bd17 cmake-gui: Support non-ASCII chars on Windows with Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7346
2022-06-11 05:52:15 -04:00
Brad King
a3e2aa3494 Merge topic 'cmWindowsRegistry-cstdint' into release-3.24
bc4c0d657a cmWindowsRegistry: Add missing <cstdint> include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7349
2022-06-11 05:49:38 -04:00
Mehdi Chinoune
497397bd17 cmake-gui: Support non-ASCII chars on Windows with Qt6
Since commit baead1e2a8 (Encoding: Remove option to use ANSI code page
internally, 2016-11-01, v3.8.0-rc1~358^2), we always use UTF-8 strings
internally.  Using fromLocal8Bit/toLocal8Bit + QTextCodec is no longer
needed.  Convert to fromStdString/toStdString instead, which should work
both with Qt5 and Qt6.

Fixes: #23565
2022-06-10 14:33:20 -04:00
Brad King
efbbae9705 Merge topic 'update-kwsys' into release-3.24
a54f7a6983 Merge branch 'upstream-KWSys' into update-kwsys
975c44654d KWSys 2022-06-09 (9b65e88d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7345
2022-06-10 11:11:25 -04:00
nanoric
bc4c0d657a cmWindowsRegistry: Add missing <cstdint> include
It is needed for `std::uint8_t`, but was left out of commit 8d7e80cf3d
(find_* commands: add control over Windows registry views, 2022-04-16).
For some reason the include-what-you-use tool does not think the include
is needed, so add an `IWYU pragma` to keep it.
2022-06-10 10:53:49 -04:00
Brad King
ec08bc1752 CheckIPOSupported: Compile check using flags of calling project
Forward `CMAKE_<LANG>_FLAGS` and `CMAKE_<LANG>_FLAGS_DEBUG` from the
calling project into the test project.  The set of flags may affect the
availability of IPO support.  Since this may change the result of the
check for existing projects, add a policy for compatibility.

This was discovered after commit 5fcadc481e (MSVC: Default to -ZI
instead of /Zi for x86 and x64, 2022-05-24) introduced policy CMP0138 to
switch our default for MSVC's debug info flag.  The `-ZI` flag is
incompatible with the `-GL` flag used for IPO, so CMP0138 was reverted
pending future work on an alternative solution.  Re-use the CMP0138
policy number for this change to CheckIPOSupported instead.

Fixes: #23607
2022-06-10 09:12:43 -04:00
Brad King
a54f7a6983 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-06-09 (9b65e88d)
2022-06-09 14:19:28 -04:00
Brad King
7d73e88d3a MSVC: Revert "Default to -ZI instead of /Zi for x86 and x64"
Revert commit 5fcadc481e (MSVC: Default to -ZI instead of /Zi for x86
and x64, 2022-05-24).  The `-ZI` flag is incompatible with the `-GL`
flag used for IPO, and so is not an unconditionally better default.
Revert the change pending future design of a first-class setting for
MSVC debug info format that can be automatically reconciled with IPO
settings.

That commit introduced policy CMP0138, but we already have later policy
numbers used too.  Leave placeholder text to avoid policy renumbering.

Issue: #23607, #10189
2022-06-09 12:24:33 -04:00
Brad King
84da420a29 Merge topic 'vs-android-api' into release-3.24
9d6a080421 VS: Add AndroidAPILevel element to generated project files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !7339
2022-06-09 09:23:05 -04:00
Brad King
b33b6014b2 Begin 3.24 release versioning 2022-06-08 11:59:27 -04:00
Benjamín de la Fuente Ranea
9d6a080421 VS: Add AndroidAPILevel element to generated project files
Map `CMAKE_SYSTEM_VERSION` to the Android Target API Level for Visual
Studio projects.

Fixes: #22886
2022-06-08 09:17:20 -04:00
Kitware Robot
252093c216 CMake Nightly Date Stamp 2022-06-08 00:01:17 -04:00
Kitware Robot
3d5402d1df CMake Nightly Date Stamp 2022-06-07 00:01:06 -04:00
Brad King
ab1edff492 Merge topic 'if-command-PATH_EQUAL'
be4b9e10af if command: Add PATH_EQUAL operator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7321
2022-06-06 09:47:45 -04:00
Kitware Robot
817d88571a CMake Nightly Date Stamp 2022-06-06 00:02:17 -04:00
Kitware Robot
2a56c24039 CMake Nightly Date Stamp 2022-06-05 00:01:12 -04:00
Brad King
007181a165 Merge topic 'update-kwsys'
1869f82823 Merge branch 'upstream-KWSys' into update-kwsys
6b88084658 KWSys 2022-06-03 (c28e27bc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7322
2022-06-04 08:14:09 -04:00
Kitware Robot
cc2c5d4eb5 CMake Nightly Date Stamp 2022-06-04 00:01:09 -04:00
Marc Chevrier
be4b9e10af if command: Add PATH_EQUAL operator 2022-06-03 19:31:36 +02:00
Brad King
bf58164cac Merge topic 'genex-PATH_EQUAL'
4d1883df11 Genex-PATH_EQUAL: path comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7309
2022-06-03 09:44:58 -04:00
Brad King
1869f82823 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-06-03 (c28e27bc)
2022-06-03 06:47:55 -04:00
Kitware Robot
c57688d9c1 CMake Nightly Date Stamp 2022-06-03 00:01:14 -04:00
Brad King
6f72a41de0 Merge topic 'automoc-silence-ranlib-warning'
4a9daae483 automoc: silence linker warning on macos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7296
2022-06-02 09:23:10 -04:00
Kitware Robot
4c9aa6c425 CMake Nightly Date Stamp 2022-06-02 00:01:08 -04:00
Brad King
199db6117b Merge topic 'ninja-dedup-def'
6cc417586e Ninja: Avoid duplicating /DEF: linker flag with MSVC tools
39dba8a244 cmLocalGenerator: Adopt AppendModuleDefinitionFlag method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7307
2022-06-01 09:35:57 -04:00
Marc Chevrier
4d1883df11 Genex-PATH_EQUAL: path comparison
To complete issue #23498
2022-06-01 15:28:54 +02:00
Craig Scott
f3be15e438 Merge topic 'genex-PATH'
f11e66670b Genex-PATH: path handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7292
2022-06-01 08:28:07 -04:00
Tim Blechmann
4a9daae483 automoc: silence linker warning on macos
when an empty `mocs_compilation.cpp` is included in a static library,
the macos linker emits a warning:
```
/Applications/Xcode13.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib:
file: path/To/Library.a(mocs_compilation.cpp.o) has no symbols
```

we therefore generate a globally visible weak symbol in the form of a
virtual function table
2022-06-01 12:12:08 +08:00
Kitware Robot
dc061c47b5 CMake Nightly Date Stamp 2022-06-01 00:01:11 -04:00
Brad King
6cc417586e Ninja: Avoid duplicating /DEF: linker flag with MSVC tools
In commit 9a0d5a828a (Ninja: add /DEF: flag to linker call, 2012-03-10,
v2.8.8~22^2~7) the logic should have been added to `GetTargetFlags` in
place of the older logic in that method from commit 7cef36c628 (ENH: add
the ability to generate custom commands for a language that is not
supported by an IDE, 2004-10-21, v2.4.0~2655).

Fixes: #23570
2022-05-31 15:40:58 -04:00
Brad King
39dba8a244 cmLocalGenerator: Adopt AppendModuleDefinitionFlag method
Migrate from `cmCommonTargetGenerator::AddModuleDefinitionFlag`.
2022-05-31 15:40:35 -04:00
Brad King
9d89c9af46 Merge topic 'cmake-gui-locale'
ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7303
2022-05-31 11:55:10 -04:00
Marc Chevrier
f11e66670b Genex-PATH: path handling
Fixes: #23498
2022-05-31 15:39:51 +02:00
Kitware Robot
fa21bd9527 CMake Nightly Date Stamp 2022-05-31 00:01:08 -04:00
Kitware Robot
45093acd1f CMake Nightly Date Stamp 2022-05-30 00:01:11 -04:00
Kitware Robot
9f4aec6d61 CMake Nightly Date Stamp 2022-05-29 00:01:13 -04:00