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

31512 Commits

Author SHA1 Message Date
Brad King
7a31aeffe8 Merge topic 'ifw-archive-format' 
62ef2729ee CPackIFW: add support for archive format and compression level options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6666
 2021-10-29 08:54:23 -04:00
Brad King
0486f9e56e Merge topic 'swift-win32-property' 
c782f140d4 Swift: Ignore WIN32_EXECUTABLE property outside of Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6658
 2021-10-29 08:53:26 -04:00
Kitware Robot
83aeec6015 CMake Nightly Date Stamp 2021-10-29 00:02:01 -04:00
hotwatermorning
c782f140d4 Swift: Ignore WIN32_EXECUTABLE property outside of Windows 
Issue: #19877
 2021-10-28 15:32:44 -04:00
Brad King
51e9d93c9c Merge topic 'target-sources-file-set' 
a7c71b9f03 Tests: Add tests for target_sources(FILE_SET) and associated functionality
4b0ee4e338 Help: Add documentation for target_sources(FILE_SET) and associated properties
3c3698b0e4 FileAPI: Add information on file set installers
8a09723bff cmGeneratorTarget: Integrate file sets into calculated sources
2a78d47b16 install(EXPORT): Install file sets
9b479124cc install(TARGETS): Add FILE_SET mode
d8af2d954f target_sources(): Add FILE_SET mode
f2bd022468 cmTargetSources: Refactor to add enum class parameters
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6653
 2021-10-28 09:58:13 -04:00
Erlend E. Aasland
62ef2729ee CPackIFW: add support for archive format and compression level options 
Adds the following CPackIFW variables:

- CPACK_IFW_ARCHIVE_FORMAT
- CPACK_IFW_ARCHIVE_COMPRESSION

These variables control mirror the --archive-format and --compression
options of the QtIFW binarycreator and repogen tools.

Fixes: #22803

Co-authored-by: Erlend E. Aasland <erlend.aasland@innova.no>
Co-authored-by: Awen Autret
 2021-10-28 15:46:22 +02:00
Brad King
f66eb3addd Merge topic 'update-kwsys' 
848eeba483 Merge branch 'upstream-KWSys' into update-kwsys
6015a898d4 KWSys 2021-10-27 (e19a5668)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6670
 2021-10-28 09:15:17 -04:00
Brad King
3055b202ec Merge topic 'builtin-help-versionadded' 
054754359a cmRST: support `versionadded` and `versionchanged` directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6667
 2021-10-28 09:09:24 -04:00
Kitware Robot
f186934161 CMake Nightly Date Stamp 2021-10-28 00:02:13 -04:00
Kyle Edwards
3c3698b0e4 FileAPI: Add information on file set installers 2021-10-27 15:17:23 -04:00
Kyle Edwards
8a09723bff cmGeneratorTarget: Integrate file sets into calculated sources 2021-10-27 15:17:23 -04:00
Kyle Edwards
2a78d47b16 install(EXPORT): Install file sets 2021-10-27 15:17:23 -04:00
Kyle Edwards
9b479124cc install(TARGETS): Add FILE_SET mode 2021-10-27 15:17:23 -04:00
Kyle Edwards
d8af2d954f target_sources(): Add FILE_SET mode 2021-10-27 15:17:23 -04:00
Kyle Edwards
f2bd022468 cmTargetSources: Refactor to add enum class parameters 2021-10-27 15:17:23 -04:00
Kyle Edwards
f2a44a8afa cmTarget: Add cmFileSet and associated properties 2021-10-27 15:17:23 -04:00
Kyle Edwards
447fbf061a EscapeForCMake: Add wrapQuotes parameter 2021-10-27 13:27:02 -04:00
Brad King
848eeba483 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-10-27 (e19a5668)
 2021-10-27 11:21:46 -04:00
Brad King
a956be4847 Merge topic 'warnings-cleanup' 
7e4e192ce2 Source: fix clang-tidy modernize-redundant-void-arg warning
8d671dd94c Source: fix more -Wmissing-prototypes warnings
1cf14f8c03 Source: fix many -Wmissing-prototypes warnings by marking functions static
319944b3d2 Source: fix some -Wunused-macros warnings
5257d9e71a Source: fix only -Wshorten-64-to-32 warning with explicit cast

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6648
 2021-10-27 09:24:54 -04:00
Brad King
db422ae0c7 Merge topic 'more-rule-of-3' 
8f8f73712a Source: fix more rule of 3 warnings from clang -Wdeprecated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6659
 2021-10-27 09:24:01 -04:00
Brad King
9bb7982a15 Merge topic 'purge-sprintf' 
b7e9cd05cd Replace the only non-standard _snprintf with snprintf
5ba6e8ac59 Source: Replace most calls to sprintf with snprintf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6649
 2021-10-27 09:23:17 -04:00
Brad King
ede11598ba Merge topic 'simplify-boolean-expressions' 
dd918c517d Source: Simplify some boolean expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6654
 2021-10-27 09:22:04 -04:00
Brad King
b33c67a6f7 Merge topic 'envmod-support-mod-to-new-variables' 
69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6663
 2021-10-27 09:20:46 -04:00
Brad King
458b30ce40 Merge topic 'vs-instance-repeat' 
9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6665
 2021-10-27 09:19:54 -04:00
Ben Boeckel
054754359a cmRST: support versionadded and versionchanged directives 
This makes `versionadded` and `versionchanged` directives show up in
`cmake --help-*` output instead of disappearing (and potentially making
empty sections).

Fixes: #22808
 2021-10-27 09:15:00 -04:00
Kitware Robot
af3d2669a8 CMake Nightly Date Stamp 2021-10-27 00:02:09 -04:00
Brad King
9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance 
Fix logic added by commit 8917b8512f
(cmGlobalVisualStudioVersionedGenerator: Allow repeating
SetGeneratorInstance, 2021-10-20) to avoid repeating work.
 2021-10-26 14:07:07 -04:00
Ben Boeckel
69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars 
When appending or modifying to a variable that has not been modified
before, the iterator was not valid, but it was used to insert into the
map again. Instead, just use indexing into the map since we know it will
exist by the end of the function anyways.

Fixes: #22796
 2021-10-26 12:51:44 -04:00
Sean McBride
8f8f73712a Source: fix more rule of 3 warnings from clang -Wdeprecated 2021-10-26 09:46:34 -04:00
Kitware Robot
a523a7e801 CMake Nightly Date Stamp 2021-10-26 00:02:02 -04:00
Sean McBride
b7e9cd05cd Replace the only non-standard _snprintf with snprintf 2021-10-25 18:23:13 -04:00
Sean McBride
5ba6e8ac59 Source: Replace most calls to sprintf with snprintf 2021-10-25 18:23:13 -04:00
Sean McBride
7e4e192ce2 Source: fix clang-tidy modernize-redundant-void-arg warning 2021-10-25 12:27:10 -04:00
Sean McBride
8d671dd94c Source: fix more -Wmissing-prototypes warnings 2021-10-25 12:27:10 -04:00
Sean McBride
1cf14f8c03 Source: fix many -Wmissing-prototypes warnings by marking functions static 2021-10-25 12:27:09 -04:00
Sean McBride
319944b3d2 Source: fix some -Wunused-macros warnings 
- deleted one unused define
- moved define into #if block where it is used
 2021-10-25 12:27:08 -04:00
Sean McBride
5257d9e71a Source: fix only -Wshorten-64-to-32 warning with explicit cast 2021-10-25 12:27:08 -04:00
Kitware Robot
3c9789f35e CMake Nightly Date Stamp 2021-10-25 00:03:12 -04:00
Kitware Robot
cf1e72f5f9 CMake Nightly Date Stamp 2021-10-24 00:01:07 -04:00
Rose
dd918c517d Source: Simplify some boolean expressions 2021-10-23 11:30:27 -04:00
Kitware Robot
46bd57d245 CMake Nightly Date Stamp 2021-10-23 00:03:11 -04:00
Brad King
ca3e83250f Merge topic 'lcc-policy' 
3958ed878f LCC: Add policy CMP0129 regarding interpreting LCC as GNU

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6643
 2021-10-22 07:08:58 -04:00
Kitware Robot
26c61c6244 CMake Nightly Date Stamp 2021-10-22 00:01:07 -04:00
makise-homura
3958ed878f LCC: Add policy CMP0129 regarding interpreting LCC as GNU 
Due to MCST LCC compiler identification is now changed to LCC,
there should be a way for old projects to still identify it as GNU,
as it was before.
This commits adds the policy:
CMP0129: Compiler id for MCST LCC compilers is now LCC, not GNU.
This policy controls such a behavior.
OLD behaivior is to treat LCC as GNU, NEW is to treat is as LCC.
 2021-10-21 17:24:22 +03:00
Brad King
fcab9785c9 Merge topic 'vs-instance' 
46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file
42418b02f7 Android: Refactor sysroot detection under Visual Studio
44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key
6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early
7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10
8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance
6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6646
 2021-10-21 09:21:24 -04:00
Brad King
edd60a2188 Merge topic 'fix_reroot_paths' 
91ec6eee58 find_package: Don't reroot prefix that is equal to a root path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6644
 2021-10-21 09:19:22 -04:00
Brad King
95e8d89a29 Merge topic 'refactor_cuda_support_to_allow_rdc_ptx' 
61b9764b03 CUDA: Allow both CUDA_SEPARABLE_COMPILATION and CUDA_PTX_COMPILATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6594
 2021-10-21 09:18:23 -04:00
Kitware Robot
0af3c2e78c CMake Nightly Date Stamp 2021-10-21 00:02:55 -04:00
Brad King
46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file 
Revert the changes from commit d5b5c19278 (cmGlobalGenerator:
FindMakeProgram() before CMakeDetermineSystem, 2020-06-15,
v3.19.0-rc1~619^2~3) and commit ef91fb02f3 (cmGlobalGenerator:
FindMakeProgram() at a generator-specific time, 2020-11-23,
v3.19.1~2^2).  We must delay selecting the location of MSBuild until
after an instance of Visual Studio has been selected.

It is now safe to revert the ordering because the motivating use
case (sysroot detection in Platform/Android-Determine) has been
implemented another way.

Fixes: #22782
 2021-10-20 13:00:26 -04:00
Brad King
44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key 
When using the Visual Studio generator for VS 10 or above,
offer this key to get the location of the MSBuild command
before the first `project()` or `enable_language()` command
has finished running.

This will be needed only by one of our own modules, so leave it
undocumented for now.
 2021-10-20 13:00:25 -04:00