summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: COMPILE_OPTIONS: bundle cross refs, add exampleJoachim Wuttke (h)2020-05-141-5/+11
|
* 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
| * | | | | | | | MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and aboveBrad King2020-05-111-7/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 15.6 introduced support for this pragma. Older MSVC versions warn that it is unknown. Fixes: #20692
* | | | | | | | Merge branch 'release-3.17'Brad King2020-05-120-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'xl-cpp-install' into release-3.17Brad King2020-05-121-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4735
* | \ \ \ \ \ \ \ Merge topic 'xl-cpp-install'Brad King2020-05-121-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4735
| * | | | | | | | XL: Install our Fortran 'cpp' helper script with execute permissionBrad King2020-05-111-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script was added by commit 19f267c75e (XL: Add support for Ninja and XL Fortran, 2019-11-21, v3.17.0-rc1~368^2) but does not have a `.sh` extension so our existing install rules neglect to give it execute permission. Our test suite works on XL Fortran in the build tree but the script is broken without execute permission on installation. Fixes: #20695
* | | | | | | | Merge topic 'system-zlib-qt-warnings'Brad King2020-05-121-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 029928b706 CTestCustom: Suppress warning about zlib symbol conflict with QtCore Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4732
| * | | | | | | | CTestCustom: Suppress warning about zlib symbol conflict with QtCoreBrad King2020-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building `cmake-gui` with system-installed `zlib` and `QtCore`, the latter has a different copy of zlib that conflicts and produces warnings on Solaris. Suppress them from report to CDash to clean up nightly builds.
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-121-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge topic 'doxygen-generated-sources'Brad King2020-05-112-8/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ec9690802 FindDoxygen: Allow generated files with USE_STAMP_FILE 683abe4366 FindDoxygen: Formatting-only indentation cleanup for test case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4726
| * | | | | | | | FindDoxygen: Allow generated files with USE_STAMP_FILECraig Scott2020-05-092-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20597
| * | | | | | | | FindDoxygen: Formatting-only indentation cleanup for test caseCraig Scott2020-05-091-4/+4
| | | | | | | | |
* | | | | | | | | Merge topic 'source_group_forward_slashes'Brad King2020-05-116-7/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faf44a8cdb source_group: Support forward slashes in group hierarchy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4727