mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,079 Commits 2 Branches 401 Tags
4862f3b2c88e37187c9a5e323f8881b24dbdabef
Commit Graph

31495 Commits

Author SHA1 Message Date
Brad King 4862f3b2c8 cmcmd: Write progress and tar errors directly to stderr 
In these code paths, `cmSystemTools::Message` never has a callback
set.  Inline the non-callback implementation at call sites.
 2021-10-27 12:58:29 -04:00
Brad King efc6c23a47 bootstrap: Do not declare cmSystemTools functions that are not implemented 
Convert runtime error messages into compile-time errors.
 2021-10-27 12:58:02 -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
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
Brad King 6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early 
Add a way to find MSBuild before the main `FindMakeProgram` code path
has executed.
 2021-10-20 13:00:25 -04:00
Brad King 7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10 2021-10-20 13:00:25 -04:00
Brad King 8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance 2021-10-20 13:00:25 -04:00
Brad King 6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search 
While at it, convert to inline initialization.
 2021-10-20 13:00:25 -04:00
Alexandru Croitor 91ec6eee58 find_package: Don't reroot prefix that is equal to a root path 
When both CMAKE_FIND_ROOT_PATH and CMAKE_PREFIX_PATH are set to
/opt/my_device_sysroot, cmFindCommon::RerootPaths would only look
for packages in /opt/my_device_sysroot/opt/my_device_sysroot
but would not try to look in /opt/my_device_sysroot.

Make sure to not reroot the prefix path in such a case.

Fixes: #21937
 2021-10-20 18:50:41 +02:00
Robert Maynard 61b9764b03 CUDA: Allow both CUDA_SEPARABLE_COMPILATION and CUDA_PTX_COMPILATION 
The target properties `CUDA_SEPARABLE_COMPILATION` and `CUDA_PTX_COMPILATION`
now aren't mutually exclusive and can now be used together on the same
target.
 2021-10-20 11:18:06 -04:00
Brad King 3b5e1b53ea Merge topic 'vs-unity-individual-pch' 
71f15be957 VS: Fix compilation of single source with PCH in Unity Build
7fcc35c676 Tests: Clean RunCMake.UnityBuild cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6641
 2021-10-20 09:02:32 -04:00
Kitware Robot 9be4c7f0c4 CMake Nightly Date Stamp 2021-10-20 00:01:06 -04:00
Brad King 71f15be957 VS: Fix compilation of single source with PCH in Unity Build 
Sources that are part of a unity build are normally not compiled
individually.  However, the VS IDE allows a single source to be
compiled.  This can also be achieved on the command line:

    msbuild my.vcxproj ... -t:ClCompile -p:SelectedFiles=<src>

where `<src>` is the path in the vcxproj `ClCompile` entry.

In a target with precompiled headers, the source needs PCH settings to
support individual compilation even if the normal unity build does not.
 2021-10-19 11:50:07 -04:00
Brad King d723bac01c Merge topic 'lcc-compiler' 
02b2607a5c Help: Add release note for MCST LCC compiler support
e5d9fce03f LCC: Add dedicated support for MCST LCC compiler
2b9ef77944 CPack/DEB: deal with broken dpkg-shlibdeps on E2K architecture
0995c75301 Tests/RPM: skip tests tat rely on debugedit if it's not found
ea55ac9a51 Tests/RunCMake/CommandLine: Deal with locales that are different from English

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6608
 2021-10-19 09:22:22 -04:00
Brad King 9f1ab65806 Merge topic 'ifw-run-program' 
f2f4e66f64 CPackIFW: Add support for RunProgram* config variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Merge-request: !6610
 2021-10-19 09:02:07 -04:00
Kitware Robot 0a4ee77f39 CMake Nightly Date Stamp 2021-10-19 00:01:05 -04:00
Brad King 2d620e8380 Merge topic 'imported-no-system' 
14d98bcfe6 export: Propagate IMPORTED_NO_SYSTEM target property to consumers
7df0541055 Add property to mark IMPORTED targets as not SYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Allison Vacanti <alliepiper16@gmail.com>
Merge-request: !6627
 2021-10-18 09:38:28 -04:00
Brad King 3c855b167f Merge topic 'fix-ifdef-windows' 
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6631
 2021-10-18 09:29:20 -04:00
Brad King 263f8c6119 Merge topic 'fix-ifdef-windows' into release-3.22 
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6631
 2021-10-18 09:29:19 -04:00
Brad King e495f360b2 Merge topic 'ctest_submit-inactivity-timeout' 
5d178fcc53 CTest: Add CTEST_SUBMIT_INACTIVITY_TIMEOUT variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6584
 2021-10-18 09:27:14 -04:00
Brad King fe9b3d9fba Merge topic 'clang-Wdeprecated' 
e2a4718d18 Source: Fix Clang -Wdeprecated warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6626
 2021-10-18 09:26:18 -04:00