mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-19 21:50:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,551 Commits 2 Branches 391 Tags
b3f1f568d31832ac82fd190360da5a09ea8caa8e
Commit Graph

31675 Commits

Author SHA1 Message Date
Kitware Robot
14f8990a60 CMake Nightly Date Stamp 2021-12-06 00:03:24 -05:00
Kitware Robot
a54f18ff36 CMake Nightly Date Stamp 2021-12-05 00:02:10 -05:00
Kitware Robot
b00cb8f405 CMake Nightly Date Stamp 2021-12-04 00:02:33 -05:00
Brad King
9ecb24b5a7 Merge topic 'vs-csproj-scripts' 
13a7ae2194 VS: Revert "Add missing label in C# project-build events"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6781
 2021-12-03 08:54:34 -05:00
Kitware Robot
824a6836be CMake Nightly Date Stamp 2021-12-03 00:02:10 -05:00
Brad King
13a7ae2194 VS: Revert "Add missing label in C# project-build events" 
Revert commit b284a21fee (VS: Add missing label in C# project-build
events, 2021-09-03, v3.22.0-rc1~156^2).  The change broke cases using
multiple successful custom commands.  Revert it pending further
investigation into the interaction of the generated script code with
`Microsoft.Common.CurrentVersion.targets`, and whether this is needed
for all managed projects or just C# projects.

Also add a test covering the case that was broken.

Fixes: #22964
Issue: #21440
 2021-12-02 18:06:39 -05:00
Brad King
2d4c3cf684 Merge topic 'ifw-sign-installer' 
e8e07a90c1 CPackIFW: add support for signing the generated app bundles on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6754
 2021-12-02 12:32:01 -05:00
Brad King
304e5e3584 Merge topic 'cleanup-ConvertToIncludeReference' 
94a58e502b cmLocalGenerator: Remove unused IncludePathStyle infrastructure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6777
 2021-12-02 11:50:39 -05:00
Brad King
ec8e7ead28 Merge topic 'semi-warnings' 
4b548c1028 Source: Fix -Wmissing-variable-declarations warning
29ffa5f48c Source: fix -Wextra-semi-stmt warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6758
 2021-12-02 11:49:52 -05:00
Brad King
9027545354 Merge topic 'vs-enum-class' 
a80d95b114 cmVisualStudio10TargetGenerator: Change VsProjectType to be enum class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6776
 2021-12-02 11:47:31 -05:00
Brad King
57349a4851 Merge topic 'rpath-unrecognized-format' 
643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty
5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6779
 2021-12-02 11:45:38 -05:00
Kitware Robot
ec55e0abc1 CMake Nightly Date Stamp 2021-12-02 00:02:17 -05:00
Brad King
643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty 
Since commit 2e1149874d (cmSystemTools: Support multiple binary formats,
2021-06-14, v3.22.0-rc1~575^2) the `file(RPATH_...)` operations fail on
files that are not ELF or XCOFF format.  Previously the RPATH operations
tolerated files of unknown format if the goal was to produce a file with
an empty RPATH.  Restore this tolerance in order to support setting an
empty RPATH on GNU ld scripts.

Fixes: #22963
 2021-12-01 12:58:11 -05:00
Brad King
5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void 
The `CheckRPath` arguments are always used now.
 2021-12-01 12:40:03 -05:00
Brad King
94a58e502b cmLocalGenerator: Remove unused IncludePathStyle infrastructure 
It is unused since commit c564a3e3ff (Ninja: Always compile sources
using absolute paths, 2021-05-19, v3.21.0-rc1~129^2), which left
behind a FIXME comment to eventually remove it.
 2021-12-01 11:33:30 -05:00
Sean McBride
4b548c1028 Source: Fix -Wmissing-variable-declarations warning 2021-12-01 11:17:39 -05:00
Sean McBride
29ffa5f48c Source: fix -Wextra-semi-stmt warnings 2021-12-01 11:17:39 -05:00
Sumit Bhardwaj
a80d95b114 cmVisualStudio10TargetGenerator: Change VsProjectType to be enum class 2021-12-01 09:51:26 -05:00
Brad King
faaf82175c Merge topic 'deps-quiet-rc' 
1336a76380 cmcldeps: Suppress rc dummy output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6771
 2021-12-01 09:41:13 -05:00
Brad King
9c3b97eb32 Merge topic 'mingw-strftime-crash' 
992e6d7c5d mingw: fix calling convention for strftime()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6762
 2021-12-01 09:33:23 -05:00
Kitware Robot
2097f9a3a4 CMake Nightly Date Stamp 2021-12-01 00:02:16 -05:00
Christoph Reiter
992e6d7c5d mingw: fix calling convention for strftime() 
`strftime` uses `__cdecl` and not `__stdcall`.  This was exposed by
refactoring in commit 26c9fbab46 (MINGW-w64: Fix string(TIMESTAMP) build
on 32bits, 2021-11-16, v3.22.0~1^2).

This fixes a crash creating a timestamp with clang+mingw-w64 targeting x86.

Fixes: #22939
 2021-11-30 11:03:33 -05:00
Kitware Robot
8af730d87d CMake Nightly Date Stamp 2021-11-30 00:01:09 -05:00
Orgad Shaneh
1336a76380 cmcldeps: Suppress rc dummy output 
Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384
Copyright (C) Microsoft Corporation.  All rights reserved.
 2021-11-29 09:46:36 +02:00
Kitware Robot
f9a657ee5d CMake Nightly Date Stamp 2021-11-29 00:01:25 -05:00
Kitware Robot
dea324f804 CMake Nightly Date Stamp 2021-11-28 00:02:26 -05:00
Kitware Robot
56e6f68d5a CMake Nightly Date Stamp 2021-11-27 00:02:10 -05:00
Kitware Robot
9b6ad5d528 CMake Nightly Date Stamp 2021-11-26 00:01:07 -05:00
Kitware Robot
12d4372b58 CMake Nightly Date Stamp 2021-11-25 00:02:07 -05:00
Kitware Robot
dfc8eb90eb CMake Nightly Date Stamp 2021-11-24 00:01:45 -05:00
Brad King
501766ff4e Merge topic 'iwyu-windows' 
0e58a5ea07 Source: Fix possible IWYU warnings in Windows generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6749
 2021-11-23 10:00:22 -05:00
Brad King
4133c426c2 Merge topic 'env-init-configs' 
5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6755
 2021-11-23 09:55:17 -05:00
Kitware Robot
7fb6a778ce CMake Nightly Date Stamp 2021-11-23 00:01:07 -05:00
Erlend E. Aasland
e8e07a90c1 CPackIFW: add support for signing the generated app bundles on macOS 
Adds the CPACK_IFW_PACKAGE_SIGNING_IDENTITY CPackIFW variable.

This variable mirrors the --sign option of the binarycreator tool.

Fixes: #22927
 2021-11-22 23:30:57 +01:00
Brad King
5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars 
Since:

* commit e216b9bbd3 (cmake: Allow CMAKE_BUILD_TYPE to be set by
                     environment variable, 2021-06-29, v3.22.0-rc1~503^2~1)
* commit ef56eefc9b (cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by
                     environment variable, 2021-06-29, v3.22.0-rc1~503^2)

the environment variables are supposed to provide defaults for settings
the user otherwise can control via cache entries.  However, they
accidentally affect `try_compile` projects too, which are supposed to be
programmatically controlled.

Fixes: #22935
 2021-11-22 12:50:42 -05:00
Brad King
86047f75fc Merge topic 'cpack-productbuild-identifier' 
7213ceb869 CPack/productbuild: Add option to customize product identifier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6738
 2021-11-22 11:26:43 -05:00
Brad King
30d1850d7a Merge topic 'automoc-cross-windows' 
1e550ad02d AutoMoc: Only add the WIN32 define if the target system is Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6751
 2021-11-22 11:16:44 -05:00
Kitware Robot
75f36fe30d CMake Nightly Date Stamp 2021-11-22 00:01:11 -05:00
Kitware Robot
55d0c88309 CMake Nightly Date Stamp 2021-11-21 00:02:09 -05:00
Kitware Robot
c5806da192 CMake Nightly Date Stamp 2021-11-20 00:02:10 -05:00
Joerg Bornemann
1e550ad02d AutoMoc: Only add the WIN32 define if the target system is Windows 
When there's no moc_predefs.h generated, we add the WIN32 define as
fallback.

Before this change, we added the WIN32 define if the host system was
Windows.  That's wrong when cross-compiling.  Now we're checking whether
the target system is Windows.

Fixes: #22933
 2021-11-19 17:56:19 +01:00
NAKAMURA Takumi
0e58a5ea07 Source: Fix possible IWYU warnings in Windows generators 2021-11-20 00:50:33 +09:00
Brad King
4a3480a786 Merge topic 'custom-command-unique_ptr' 
3bb2542535 cmMakefile: Simplify Add*Command and adopt to cmAddCustom*Command
c46b041a3b cmLocalGenerator: Simplify Add{Custom,Utility}Command
68b4e3b255 cmGlobalVisualStudio8Generator: Fix the misaligned argument, stdPipesUTF8
e37511ae7e cmMakefile: Simplify detail:::Add{Custom,Utility}Command
90e1206f25 cmMakefile: Introduce GeneratorAction as the class.
9b31a97748 cmCustomCommand: Move constructor arguments to individual setters
d0158b765b cmMakefile: Move CMP0116 lookup into Add{Custom,Utility}Command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6708
 2021-11-19 09:06:54 -05:00
Brad King
3519c19091 Merge topic 'ghs_initial_setup' 
aa59eaac4f GHS: Allow setting GHS variables from toolchain file
ab6f0b51b1 GHS: Add note about -T and path style
a55b5c4e18 GHS: Update BSP selection logic
0427f22539 GHS: Update RTOS selection logic
e006b87cc6 GHS: GHSMULTI - Update documentation to match implementation
83eb5695e9 GHS: Update toolset selection logic
8114ddcad1 GHS: Continue splitting variables used by generator
831607889f GHS: Update selection of primaryTarget in MULTI project file
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6715
 2021-11-19 09:05:35 -05:00
Kitware Robot
7d1cb6496e CMake Nightly Date Stamp 2021-11-19 00:02:14 -05:00
Greg Fiumara
7213ceb869 CPack/productbuild: Add option to customize product identifier 
This adds a new option, CPACK_PRODUCTBUILD_IDENTIFIER, which allows
for customization of the productbuild product identifier within the
CPack productbuild generator.

Fixes: #20830
 2021-11-18 13:01:35 -05:00
NAKAMURA Takumi
3bb2542535 cmMakefile: Simplify Add*Command and adopt to cmAddCustom*Command 2021-11-18 12:02:38 -05:00
NAKAMURA Takumi
c46b041a3b cmLocalGenerator: Simplify Add{Custom,Utility}Command 2021-11-18 12:02:38 -05:00
NAKAMURA Takumi
68b4e3b255 cmGlobalVisualStudio8Generator: Fix the misaligned argument, stdPipesUTF8 
The call to AddCustomCommandToTarget for "Checking File Globs" had misaligned
arguments and previously passed `stdPipesUTF8` as `escapeOldStyle`.

For now, set `escapeOldStyle` as `true`. Also `stdPipesUTF8` is `true` here.
 2021-11-18 12:02:37 -05:00
NAKAMURA Takumi
e37511ae7e cmMakefile: Simplify detail:::Add{Custom,Utility}Command 
Note 1: `detail::AddCustomCommandToTarget()` resets cc,
since cc is not moved away.

Note 2: In `detail::AddUtilityCommand()`, a few vars are preserved
before using. Their refs will be alive in most cases, but cc might
be destroyed in the future.
 2021-11-18 12:02:37 -05:00