mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 18:08:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,286 Commits 2 Branches 401 Tags
9fc8e827c8a543e3976726e433ceeafaba145c8a
Commit Graph

7676 Commits

Author SHA1 Message Date
Brad King 9fc8e827c8 Tests: Fix -Wsuggest-destructor-override warning in testCMExtMemory 2020-07-28 10:06:31 -04:00
Brad King 40d3f5a227 Merge topic 'revert-add_test-special-chars' 
5fc5f4d26e add_test: Revert "Allow special characters in test name"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5067
 2020-07-28 08:24:34 -04:00
Brad King 738f89f1ec Merge topic 'ctest-prefer-normative-text' 
c83919d193 CTest: Prefer normative terms to express subprocess failures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lukas Riedel <mail@lukasriedel.com>
Acked-by: Yunus Sevinchan <yunussevinchan@gmail.com>
Merge-request: !5050
 2020-07-28 08:21:38 -04:00
Brad King 5fc5f4d26e add_test: Revert "Allow special characters in test name" 
Revert commit f84af8e270 (add_test: Allow special characters in test
name, 2020-05-16, v3.18.0-rc1~142^2).  Unfortunately the fix breaks
projects that were working around the limitation with manual escaping.
The fix can be re-introduced with a policy in a future version.

Also add a 3.18.1 release note explaining the change.

Fixes: #21017, #20965
Issue: #19391
 2020-07-28 08:04:11 +10:00
Brad King ea8bb8a2a7 Merge topic 'vs-lang-flags' 
a33a4ec68b Merge branch 'backport-vs-lang-flags' into vs-lang-flags
c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5051
 2020-07-27 10:42:44 -04:00
Brad King 11cf196fd2 Merge topic 'EXCLUDE_FROM_ALL-genex' 
22bd267388 Help: Add release note for EXCLUDE_FROM_ALL genex support
807c8aa9f0 Tests: Simplify RunCMake.ExcludeFromAll single-config case
36743436cf Tests: Fix RunCMake.ExcludeFromAll test program warning
99c131c5a3 cmGlobalGenerator: Fix spelling of EXCLUDE_FROM_ALL in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5049
 2020-07-27 10:40:56 -04:00
Robert Maynard c83919d193 CTest: Prefer normative terms to express subprocess failures 
Issue: #21004
 2020-07-27 10:32:21 -04:00
Brad King a33a4ec68b Merge branch 'backport-vs-lang-flags' into vs-lang-flags 2020-07-23 10:58:11 -04:00
Brad King c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC 
Since commit 3b547e2e4b (VS: Simplify logic adding source file C/C++
language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) we only add a
per-source language selection flag when the source file extension does
not match the compiler's default.  This approach breaks when a project
adds a target-wide `-TP` flag.

Although such projects likely did not work with non-VS generators, we
did support them before in Visual Studio generators.  Add a special case
to tolerate such flags again.

Fixes: #21005
 2020-07-23 10:54:35 -04:00
Brad King e3b5abd068 Merge topic 'fix-typos-identified-using-codespell' 
207373802e Fix typos identified using codespell

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5040
 2020-07-23 08:28:21 -04:00
Brad King 733edddf5c Merge topic 'test-RunCMake.InterfaceLibrary' 
4ac9ee10ad Tests: Rename test RunCMake.{interface_library => InterfaceLibrary}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5042
 2020-07-23 08:26:02 -04:00
Brad King b890937fdd Merge topic 'CheckTypeSize-std-types' 
7f786c6a40 Tests: Cover CheckTypeSize with uint8_t and std::uint8_t
371072e9e1 CheckTypeSize: Use C++-style headers to check for std:: types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5008
 2020-07-23 08:25:10 -04:00
Brad King 807c8aa9f0 Tests: Simplify RunCMake.ExcludeFromAll single-config case 
Also avoid using parts of an unrelated test (NinjaMultiConfig)
that were not designed for use with all generators.
 2020-07-23 07:13:36 -04:00
Brad King 36743436cf Tests: Fix RunCMake.ExcludeFromAll test program warning 
Add a return value to `main()`.
 2020-07-23 07:13:36 -04:00
Brad King 99c131c5a3 cmGlobalGenerator: Fix spelling of EXCLUDE_FROM_ALL in error message 2020-07-23 07:13:36 -04:00
Brad King 4ac9ee10ad Tests: Rename test RunCMake.{interface_library => InterfaceLibrary} 
Our RunCMake.<lower-case> namespace is meant for testing individual
CMake language commands.
 2020-07-22 13:42:58 -04:00
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 d45f0d719e Merge topic 'EXCLUDE_FROM_ALL-genex' 
2cdaf43d96 Allow generator expressions in the EXCLUDE_FROM_ALL target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5021
 2020-07-22 11:23:34 -04:00
Brad King 1f8bbfec0f Merge topic 'TARGET_PROPERTY-strip-empty-list-elements' 
af1a4f52be Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5030
 2020-07-22 08:47:58 -04:00
Brad King c8a6da06d2 Merge topic 'graphviz-restore-per-target' into release-3.18 
1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target'
f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options
93549b9224 Graphviz: Restore support for per-target dependency graph options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5039
 2020-07-22 08:42:36 -04:00
Brad King 7f786c6a40 Tests: Cover CheckTypeSize with uint8_t and std::uint8_t 2020-07-22 08:25:09 -04:00
Stephan Rohmen a78e991420 Tests: Cover Graphviz support for per-target dependency graph options 
Issue: #20928
 2020-07-21 15:02:21 -04:00
Brad King 1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target' 2020-07-21 15:00:52 -04:00
Stephan Rohmen f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options 
Issue: #20928
 2020-07-21 14:55:44 -04:00
Joerg Bornemann 2cdaf43d96 Allow generator expressions in the EXCLUDE_FROM_ALL target property 
This allows for setting EXCLUDE_FROM_ALL, conditional on the build
configuration. However, only the Ninja Multi-Config generator supports
different property values per config. All other multi-config
generators will yield an error in that situation.

Fixes: #20923
 2020-07-21 17:16:26 +02:00
Marc Chevrier af1a4f52be Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined properties 
Fixes: #20951
 2020-07-21 15:08:28 +02: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