summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmPropertyDefinitionMap: simplify and shortenTushar Maheshwari2020-05-158-117/+64
|
* Merge branch 'release-3.16'Brad King2020-05-150-0/+0
|\
| * Merge branch 'backport-3.16-objc-env-vars' into release-3.16Brad King2020-05-146-18/+61
| |\
* | \ Merge branch 'release-3.17'Brad King2020-05-150-0/+0
|\ \ \
| * \ \ Merge topic 'objc-env-vars' into release-3.17Brad King2020-05-157-18/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection 16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4746
* | \ \ \ Merge topic 'objc-env-vars'Brad King2020-05-157-18/+65
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection 16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4746
| * | | | Help: Add 3.17.3 release note for Objective C/C++ compiler selectionBrad King2020-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | Port the 3.16.7 release note for 3.17.3 too.
| * | | | Merge branch 'backport-3.16-objc-env-vars' into objc-env-varsBrad King2020-05-146-18/+61
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Objective C/C++: Honor CC and CXX env vars to select compilerBrad King2020-05-145-18/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the `OBJC` or `OBJCXX` environment variable is not set to specify an Objective C or C++ compiler, check `CC` or `CXX` too. Fixes: #20703
| | * | Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilersBrad King2020-05-143-0/+24
| | | |
* | | | Merge topic 'FindSquish-add_test'Brad King2020-05-151-30/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2137384202 FindSquish: Make squish_add_test work with any Squish version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4648
| * | | | FindSquish: Make squish_add_test work with any Squish versionFrederik Gladhorn2020-05-131-30/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the documentation (Squish 4 is from 2010, so people are likely using something newer) and let squish_add_test call either the v3 or v4 macro based on the detected Squish version. This cannot break things, since mixing incompatible versions would not have worked before.
* | | | | CMake Nightly Date StampKitware Robot2020-05-151-1/+1
| | | | |
* | | | | Merge topic 'tests-Wstrict-prototypes'Brad King2020-05-143-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4150a18910 Tests: Fix -Wstrict-prototypes warnings in some C sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4744
| * | | | | Tests: Fix -Wstrict-prototypes warnings in some C sourcesBrad King2020-05-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some RunCMake tests fail with this warning due to extra stderr content: warning: this old-style function definition is not preceded by a prototype Convert `foo()` to `foo(void)` in `.c` sources of affected tests.
* | | | | | Merge topic 'update-kwsys'Brad King2020-05-1413-63/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 833ae0a63b Merge branch 'upstream-KWSys' into update-kwsys 3674f6a470 KWSys 2020-05-13 (d4da6980) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4743
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-05-1313-63/+66
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-05-13 (d4da6980)
| | * | | | | KWSys 2020-05-13 (d4da6980)KWSys Upstream2020-05-1313-63/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit d4da69800d9103a7d3654f9428386a914ba280f2 (master). Upstream Shortlog ----------------- Sean McBride (5): c58d4b47 SystemTools: On Windows, strip 'e' from Fopen mode cb541c31 Auto-fixed various clang-tidy warnings 2c179921 Applied clang-tidy modernize-deprecated-headers 775296c8 Applied clang-tidy bugprone-suspicious-string-compare fixes a19f0ac6 Fixed clang -Wstrict-prototypes warning
* | | | | | | Merge topic 'cmake_command_preserve_args'Brad King2020-05-145-8/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 549599bf32 cmake_command: Preserve arguments to INVOKE function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4741
| * | | | | | | cmake_command: Preserve arguments to INVOKE functionCristian Adam2020-05-125-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20630
* | | | | | | | Merge topic 'squish_windows_ext'Brad King2020-05-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c587b8d026 FindSquish: Fix target app name on windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4742
| * | | | | | | | FindSquish: Fix target app name on windowsFrederik Gladhorn2020-05-131-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows has .exe in the target name, but Squish only uses the name without extension which makes things a lot easier when running tests on several platforms. Discovered when coming back to Windows and doing a fresh build and suddenly the binary to be tested was no longer found due to the name mismatch.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-141-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'interface-sources-multi-config'Brad King2020-05-135-59/+123
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c5d4522bc INTERFACE_SOURCES: Fix per-config link libs on multi-config generators 8daa140c6a cmGeneratorTarget: Factor evaluated target prop entries into struct fcd1a1a920 cmGeneratorTarget: Track when the set of link libs is config-dependent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4740
| * | | | | | | | INTERFACE_SOURCES: Fix per-config link libs on multi-config generatorsBrad King2020-05-123-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In multi-config generators we memoize the computed set of source files for a target to avoid repeating the computation when the set does not depend on the configuration. We already track whether generator expressions in `SOURCES` or `INTERFACE_SOURCES` reference the configuration (`$<CONFIG:...>`). However, we previously forgot to track whether the set of libraries whose `INTERFACE_SOURCES` are considered depends on the configuration. This caused multi-config generators to use the first configuration's set of sources for all configurations in cases such as target_link_libraries(tgt PRIVATE $<$<CONFIG:Debug>:iface_debug>) where the `iface_debug` target has `INTERFACE_SOURCES`. Fix this by also tracking config-dependence of the list of libraries for evaluation of the list of source files. Fixes: #20683
| * | | | | | | | cmGeneratorTarget: Factor evaluated target prop entries into structBrad King2020-05-121-57/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow storing more than just the list of entries itself.
| * | | | | | | | cmGeneratorTarget: Track when the set of link libs is config-dependentBrad King2020-05-123-0/+16
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report in `cmLinkImplementationLibraries` and `cmLinkInterfaceLibraries` whether the list of libraries depends on a genex referencing the configuration. We already track whether a genex references the head target.
* | | | | | | | Merge branch 'release-3.17'Brad King2020-05-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'fix-cache-args-file-to-dep-list' into release-3.17Brad King2020-05-138-0/+52
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
* | \ \ \ \ \ \ \ Merge topic 'fix-cache-args-file-to-dep-list'Brad King2020-05-138-0/+52
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
| * | | | | | | ExternalProject: expose _ep_cache_args_script to the callerBen Boeckel2020-05-128-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed so that the caller can add a dependency on the cache file. Fixes: #20668
* | | | | | | | Merge topic 'conditional-CMAKE_EXPORT_COMPILE_COMMANDS'Brad King2020-05-138-7/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe19df49d4 Initialize CMAKE_EXPORT_COMPILE_COMMANDS only if not set already Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4738
| * | | | | | | | Initialize CMAKE_EXPORT_COMPILE_COMMANDS only if not set alreadyBrad King2020-05-128-7/+18
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also de-duplicate its initialization code. Fixes: #16588
* | | | | | | | Merge topic 'FindPython-IronPython-support'Brad King2020-05-135-85/+387
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8ffc60220 FindPython: Add IronPython support on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4730
| * | | | | | | FindPython: Add IronPython support on all platformsMarc Chevrier2020-05-115-85/+387
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-131-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'add_unity_mode_examples'Brad King2020-05-121-2/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caf5d3f71b Help: Add an example for each UNITY_BUILD_MODE setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4733
| * | | | | | | Help: Add an example for each UNITY_BUILD_MODE settingRobert Maynard2020-05-111-2/+38
| | | | | | | |
* | | | | | | | Merge topic 'refactor_cmSetPropertiesCommands'Brad King2020-05-124-215/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 300bf4e94f set_*_properties: simplify and shorten implementations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4728
| * | | | | | | | set_*_properties: simplify and shorten implementationsTushar Maheshwari2020-05-124-215/+91
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize argument copies and range traversal. Inline the single use file static functions.
* | | | | | | | Merge branch 'release-3.16'Brad King2020-05-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'pch-msvc-pragma' into release-3.16Brad King2020-05-111-7/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4736
| * \ \ \ \ \ \ \ Merge branch 'vs-pch-compile-opts' into release-3.16Brad King2020-05-112-1/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4734
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'vs-pch-compile-opts' into release-3.17Brad King2020-05-122-1/+4
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
* | | | | | | | | | Merge topic 'vs-pch-compile-opts'Brad King2020-05-122-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
| * | | | | | | | | VS: Fix using PCH from source with COMPILE_OPTIONSBrad King2020-05-112-1/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a source file gets per-source flags from both PCH and custom `COMPILE_OPTIONS`, combine them correctly. Fixes: #20694, #20456
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-05-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'pch-msvc-pragma' into release-3.17Brad King2020-05-121-7/+5
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736
* | | | | | | | | Merge topic 'pch-msvc-pragma'Brad King2020-05-121-7/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736