mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 21:20:40 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,173 Commits 2 Branches 390 Tags
207373802ee5458fa2cb0bd8a5ea466840ee15ec
Commit Graph

7651 Commits

Author SHA1 Message Date
Jean-Christophe Fillion-Robin
207373802e Fix typos identified using codespell 
See https://github.com/codespell-project/codespell#readme

The following command was used:

```
codespell -q6 --skip="\
.git,\
*.json,\
./Copyright.txt,\
./Help/command/foreach.rst,\
./Help/prop_test/REQUIRED_FILES.rst,\
./Help/variable/CTEST_COVERAGE_COMMAND.rst,\
./Modules/CMakeCheckCompilerFlagCommonPatterns.cmake,\
./Modules/CMakeRCInformation.cmake,\
./Modules/Internal/CPack/NSIS.template.in,\
./Modules/FindMatlab.cmake,\
./Modules/MatlabTestsRedirect.cmake,\
./Modules/Platform/Windows-Clang.cmake,\
./Modules/Platform/Windows-Intel-Fortran.cmake,\
./Modules/Platform/Windows-MSVC.cmake,\
./Source/CMakeVersion.cmake,\
./Source/cmConvertMSBuildXMLToJSON.py,\
./Source/cmCreateTestSourceList.cxx,\
./Source/cmGlobalVisualStudio10Generator.cxx,\
./Source/cmExportBuildFileGenerator.cxx,\
./Source/cmExportInstallAndroidMKGenerator.cxx,\
./Source/cmExportInstallFileGenerator.cxx,\
./Source/cmExportSet.cxx,\
./Source/cmExportTryCompileFileGenerator.cxx,\
./Source/cmFindPackageCommand.cxx,\
./Source/cmInstallCommand.cxx,\
./Source/cmGeneratorExpressionLexer.cxx,\
./Source/cmLocalVisualStudio7Generator.cxx,\
./Source/cmOrderDirectories.cxx,\
./Source/cmTarget.cxx,\
./Source/kwsys/*,\
./Source/QtDialog/CMakeSetupDialog.ui,\
./Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx,\
./Source/CTest/cmParseCoberturaCoverage.h,\
./Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in,\
./Tests/RunCMake/CPack/tests/DMG_SLA/English.license.rtf,\
./Tests/RunCMake/CPack/tests/DMG_SLA/German.license.txt,\
./Tests/RunCMake/CPack/tests/DMG_SLA/German.menu.txt,\
./Tests/RunCMake/GoogleTest/xml_output.cpp,\
./Tests/RunCMake/Make/TargetMessages*,\
./Utilities/*,\
" \
-L "\
dependees,\
endwhile,\
fo,\
filetest,\
helpfull,\
nd,\
objext,\
stoll,\
supercedes,\
superceded,\
vas,\
varn,\
"
```
 2020-07-22 12:44:47 -04:00
Brad King
be0a224696 Merge topic 'fix-xcode12-arm64-tests' 
447ecbb692 Apple: also specify sysroot for linking
16692f4926 Apple: suppress Xcode 12 ranlib warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5028
 2020-07-20 09:58:02 -04:00
Brad King
beb78ada5e Merge topic 'swift-link-iface' 
14a5712447 Swift: Fix regression in linking to interface libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5027
 2020-07-20 09:56:07 -04:00
Gregor Jasny
447ecbb692 Apple: also specify sysroot for linking 
Otherwise the compiler/linker will default to the wrong C++ runtime
library.
 2020-07-17 15:46:29 +02:00
Gregor Jasny
16692f4926 Apple: suppress Xcode 12 ranlib warning 
The Xcode 12 (Beta) toolchain for arm64 emits a warning when static
libraries are created:

```
ranlib: archive member: libStaticLib.a(a.c.o) offset in archive not a multiple of 8 (must be since member is an 64-bit object file)
```

Due to the unexpected output multiple tests are broken. To make those
tests pass we filter the problematic output in the test driver.

See: https://developer.apple.com/forums/thread/652620
 2020-07-17 15:42:26 +02:00
Brad King
14a5712447 Swift: Fix regression in linking to interface libraries 
Since commit 2026915f8f (Swift: Propagate Swift_MODULE_DIRECTORY as include
directory, 2020-02-03, v3.18.0-rc1~547^2) we internally call
`GetAllConfigCompileLanguages` on all directly linked targets without
checking if they are interface libraries that don't compile at all.
That violates an internal assumption and assertion.

Fixes: #20977
 2020-07-17 08:26:40 -04:00
Kurt Sansom
fa7157b86d FindX11: Add Xaw libraries 
Fixes: #20963
 2020-07-16 14:16:24 -05:00
Brad King
c7b7547d8d Merge topic 'cmake-E-create_hardlink' 
2fad00940d cmake: Add -E create_hardlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5015
 2020-07-16 10:19:12 -04:00
Sibi Siddharthan
2fad00940d cmake: Add -E create_hardlink 
Fixes: #20950
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-15 20:22:04 +05:30
Robert Maynard
56cf509a72 Move AddCompilerRequirementFlag to cmStandardLevelResolver 
The cmLocalGenerator::AddCompilerRequirementFlag was another
source of truth on what standard levels existed per language,
so fold that into cmStandardLevelResolver to make updating
CMake easier
 2020-07-15 09:40:33 -04:00
Craig Scott
a335999021 Merge topic 'source_file_props_dedup_scopes' into release-3.18 
f6969b917d set_property: Deduplicate source file directory scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5009
 2020-07-14 18:59:39 -04:00
Craig Scott
538668962e Merge topic 'source_file_props_dedup_scopes' 
f6969b917d set_property: Deduplicate source file directory scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5009
 2020-07-14 18:59:39 -04:00
Brad King
2da778664d Merge topic 'genx-COMPILE_LANGUAGE-support' 
6491d2503c Genex $<COMPILE_LANGUAGE>: Extend contexts supported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5005
 2020-07-14 07:22:30 -04:00
Brad King
007cd3c83e Merge topic 'macos-11-file-GET_RUNTIME_DEPENDENCIES' 
d9af90504f Tests: Update file(G_R_D) test to make system library optional
c51400033c file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4998
 2020-07-14 07:15:12 -04:00
Brad King
8c6cce27ca Merge topic 'macos-11-file-GET_RUNTIME_DEPENDENCIES' into release-3.18 
d9af90504f Tests: Update file(G_R_D) test to make system library optional
c51400033c file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4998
 2020-07-14 07:15:11 -04:00
Brad King
2ef6ad0136 Merge topic 'profiling-case-insensitive-command-names' into release-3.18 
7cf2f7d2af cmake: Store lowercase command names in profiling output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5007
 2020-07-14 07:14:08 -04:00
Brad King
41ede81341 Merge topic 'profiling-case-insensitive-command-names' 
7cf2f7d2af cmake: Store lowercase command names in profiling output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5007
 2020-07-14 07:14:08 -04:00
Alexandru Croitor
f6969b917d set_property: Deduplicate source file directory scopes 
A user could specify the same directory scope to set_property()
multiple times, which in conjunction with APPEND would append the
property multiple times.

Make sure to deduplicate scopes across both DIRECTORY and
TARGET_DIRECTORY options, so that a property is only appended
once in such a scenario.

Fixes: #20941
 2020-07-13 17:43:17 +02:00
Marc Chevrier
6491d2503c Genex $<COMPILE_LANGUAGE>: Extend contexts supported 
When genex $<TARGET_PROPERTY:...> for properties like INCLUDE_DIRECTORIES
is evaluated as part of add_custom_command or add_custom_target,
genex $<COMPILE_LANGUAGE> and $<COMPLIE_LANG_AND_ID> should be supported.

Fixes: #20926
 2020-07-13 16:27:19 +02:00
Kyle Edwards
d9af90504f Tests: Update file(G_R_D) test to make system library optional 
Since the system library may not exist on the filesystem on macOS
11, skip it if it doesn't exist.
 2020-07-13 08:32:02 -04:00
Brad King
2282be37a5 Merge topic 'stl-support-filesystem-path' 
d654bf3449 STL Support: Add cm::filesystem::path in <cm/filesystem>
e5798126fc STL Support: introduce dedicated configuration file
4408f34cfe STL Support: Add function cm::quoted in <cm/iomanip>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4968
 2020-07-13 07:59:43 -04:00
Brad King
8d268f57b4 Merge topic 'cuda-memcheck' 
cee92a9fb0 Help: add release notes for CTest cuda-memcheck support
f38e4a1871 Tests: Add cases for CTest cuda-memcheck parser
fe062800f0 CTest: add cuda-memcheck support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: tcojean <terry.cojean@kit.edu>
Merge-request: !4952
 2020-07-13 07:58:38 -04:00
Brad King
7160a2b9d9 Merge topic 'imported-local-target-alias' 
7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5002
 2020-07-13 07:53:01 -04:00
Craig Scott
7cf2f7d2af cmake: Store lowercase command names in profiling output 
This ensures commands can be properly aggregated by tools
processing the profiling output.

Fixes: #20946
 2020-07-13 11:03:05 +10:00
Marc Chevrier
7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories 
Fixes: #20942
 2020-07-11 16:59:50 +02:00
Brad King
a5064f6e65 Merge topic 'source_file_both_props' 
961ee62faa Help: Update get_property and get_source_file_property docs
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4994
 2020-07-10 06:45:09 -04:00
Tobias Ribizel
f38e4a1871 Tests: Add cases for CTest cuda-memcheck parser 2020-07-09 19:08:34 +02:00
Marc Chevrier
d654bf3449 STL Support: Add cm::filesystem::path in <cm/filesystem> 2020-07-09 17:02:42 +02:00
Brad King
43372d5ba3 Merge topic 'file-GENERATE-tmp' 
4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo'
eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default
09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files
0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4992
 2020-07-09 06:53:36 -04:00
Alexandru Croitor
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together 
Allow to specify both DIRECTORY and TARGET_DIRECTORY at the same time in
`set_source_files_properties()` and `set_property(SOURCE)` commands.

Add test cases and update the documentation.

Fixes: #20932
 2020-07-09 06:33:52 -04:00
Alexandru Croitor
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages 2020-07-09 06:33:03 -04:00
Brad King
4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo' 
Fixes: #20873
 2020-07-08 15:49:56 -04:00
Craig Scott
32e13e5291 Merge topic 'ctest-resource-spec-file-doc' 
c57695a2f4 Help: Clarify search order for resource spec file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4983
 2020-07-08 09:06:54 -04:00
Brad King
89845851a7 Merge topic 'MissingVoid' 
075ed33750 Tests: Fix pedantic warning about missing void in C function declaration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4984
 2020-07-08 08:32:15 -04:00
Brad King
fc3f932e3c Merge topic 'languageStandardMultipleBacktraceSupport' 
2f383d852d fileapi: Support multiple backtraces for language standard
cc96fb617b Add BTs helper to support multiple backtraces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4960
 2020-07-08 08:28:46 -04:00
Sean McBride
075ed33750 Tests: Fix pedantic warning about missing void in C function declaration 2020-07-07 14:41:28 -04:00
Kyle Edwards
c57695a2f4 Help: Clarify search order for resource spec file 
Clarify the order in which --resource-spec-file, RESOURCE_SPEC_FILE,
and CTEST_RESOURCE_SPEC_FILE are searched, and add tests to
enforce this.

Fixes: #20914
 2020-07-07 12:21:58 -04:00
Justin Goshi
2f383d852d fileapi: Support multiple backtraces for language standard 2020-07-06 11:40:39 -07:00
Brad King
98e0cbd8eb Tests: Verify DMG default SLA content 2020-07-03 11:31:25 -04:00
Brad King
b33283a282 Tests: Cover using RTF for DMG SLAs 2020-07-03 08:30:42 -04:00
Brad King
12497c56a9 Merge topic 'cpack-dmg-sla' 
b9737ead1f Tests: Add case for CPack DMG multi-language SLAs
925c026c31 Tests: Verify SLA in CPackComponentsForAll-DragNDrop-* DMG files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4969
 2020-07-03 07:34:47 -04:00
Brad King
977f5ed3d1 Merge topic 'restore-cwd-translation-map' 
85a945a607 Restore handling of build directory inside a symlinked path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4963
 2020-07-03 07:25:31 -04:00
Brad King
b9737ead1f Tests: Add case for CPack DMG multi-language SLAs 
Add a test for the feature added by commit f88533cc06 (CPackDMG: Add
support for multilingual SLAs, 2015-10-19, v3.5.0-rc1~232^2).

Issue: #20889
 2020-07-02 16:39:57 -04:00
Brad King
925c026c31 Tests: Verify SLA in CPackComponentsForAll-DragNDrop-* DMG files 
Issue: #20889
 2020-07-02 16:39:57 -04:00
Brad King
edce450e03 Merge topic 'gtest-xml-add-test' 
7b92e11683 Tests: Add test for GoogleTest XML_OUTPUT_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4954
 2020-07-02 08:37:00 -04:00
Brad King
85a945a607 Restore handling of build directory inside a symlinked path 
In commit dd8365b3f1 (Merge branch 'upstream-KWSys' into update-kwsys,
2020-04-06, v3.18.0-rc1~397^2) we imported KWSys commit `019afb6ea`
(SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument,
2020-04-03).  That caused `GetCurrentWorkingDirectory` to no longer send
paths through the KWSys translation map and broke CMake's detection of
the absolute path to a build directory containing a symbolic link.
Add our own `cmSystemTools::GetCurrentWorkingDirectory` wrapper around
the KWSys method in order to restore that mapping.

Test-case-by: Ben Boeckel <ben.boeckel@kitware.com>
Issue: #16228
Fixes: #20900
 2020-07-02 07:33:16 -04:00
Craig Scott
8975c2a55b Merge topic 'remove-warn-unused-vars' 
df6b077625 cmake: Remove broken '--warn-unused-vars' option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4953
 2020-07-01 07:03:54 -04:00
Brad King
b7af2811ae Merge topic 'configure_file-permission-control' 
27b03281e2 configure_file: Add option to control file permissions transfer to copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4941
 2020-07-01 07:03:03 -04:00
Brad King
57ea001247 Merge topic 'FindTIFF-tiffxx' 
a468cc431c FindTIFF: add component CXX to include the C++ wrapper libtiffxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4934
 2020-07-01 07:02:09 -04:00
Brad King
0ca6bb8575 Merge topic 'file-ARCHIVE-files-dirs' into release-3.18 
bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4955
 2020-07-01 07:00:42 -04:00