Commit Graph

49866 Commits

Author SHA1 Message Date
Pavel Otchertsov 6ef64013ba FindThreads: Add missing static keyword in pthread test code
When CMAKE_C_FLAGS contains '-Werror -Wmissing-prototypes'
the pthread test code check fails with error:
"src.c:3:7: error: no previous prototype for 'test_func' [-Werror=missing-prototypes]".
Adding 'static' keyword to 'test_func' fixes it.
2020-09-18 23:24:56 +03:00
Brad King ce89f54ee3 Merge topic 'rel-drop-old'
6a88e6332f Utilities/Release: Drop now-unused scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5234
2020-09-18 08:43:13 -04:00
Brad King 9472ed34e9 Merge branch 'release-3.18' 2020-09-18 08:42:28 -04:00
Brad King 5d952fd6e2 Merge topic 'ninja-multi-automoc-regression'
23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5238
2020-09-18 08:42:28 -04:00
Brad King f332b05666 Merge topic 'ninja-multi-automoc-regression' into release-3.18
23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5238
2020-09-18 08:42:28 -04:00
Brad King edb9e34027 Merge branch 'release-3.18' 2020-09-18 08:41:08 -04:00
Brad King ded92f69fe Merge topic 'FindMatlab-r2020b' into release-3.18
4d292aecb6 FindMatlab: add R2020b => 9.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5233
2020-09-18 08:41:08 -04:00
Brad King bdd0e28782 Merge topic 'FindMatlab-r2020b'
4d292aecb6 FindMatlab: add R2020b => 9.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5233
2020-09-18 08:41:08 -04:00
Brad King 5b2ec8c612 Merge topic 'ci-macos-package'
6dca75fd86 gitlab-ci: minimize pipeline for packaging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5237
2020-09-18 08:35:39 -04:00
Kitware Robot c829dc4bfa CMake Nightly Date Stamp 2020-09-18 00:01:23 -04:00
Kyle Edwards 23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands
a9fd3a10 addressed the scenario where the depending target is a
utility target, but not the scenario where the dependent target is
a utility target. Account for this scenario.

Also add a Qt-specific test case.

Fixes: #21118
2020-09-17 15:46:57 -04:00
Brad King 6dca75fd86 gitlab-ci: minimize pipeline for packaging 2020-09-17 13:12:30 -04:00
Brad King ac487f870b Merge topic 'ci-xcode-11.7' into release-3.18
53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5236
2020-09-17 13:00:37 -04:00
Brad King 4fc07cd369 Merge branch 'release-3.18' 2020-09-17 13:00:37 -04:00
Brad King d12fd8e84f Merge topic 'ci-xcode-11.7'
bfae54b40c Merge branch 'backport-3.18-ci-xcode-11.7' into ci-xcode-11.7
135a2d26d3 gitlab-ci: update macOS jobs to use Xcode 11.7
53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5236
2020-09-17 13:00:37 -04:00
Brad King bfae54b40c Merge branch 'backport-3.18-ci-xcode-11.7' into ci-xcode-11.7 2020-09-17 11:28:15 -04:00
Brad King 135a2d26d3 gitlab-ci: update macOS jobs to use Xcode 11.7 2020-09-17 11:27:17 -04:00
Brad King 53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7 2020-09-17 11:26:22 -04:00
Brad King 46bb6ae8d4 Merge topic 'ci-package-upload'
d747684bbb gitlab-ci: reduce verbosity of binary upload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5235
2020-09-17 10:28:39 -04:00
Brad King d747684bbb gitlab-ci: reduce verbosity of binary upload
Tell `ssh` not to print informational messages.
2020-09-17 10:12:48 -04:00
Brad King bb8afa0020 Merge topic 'string-json-support'
8eab76eb84 string(JSON): Adds JSON parsing support to the string command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5159
2020-09-17 09:47:43 -04:00
Brad King 5e53b58c4a Merge topic 'finddoxygen-permission-denied'
818c6948da FindDoxygen: build the generated file contents using temporary strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5230
2020-09-17 09:46:42 -04:00
Brad King 4be10a328a Merge topic 'findlibxml2_add_names'
fa258f175d FindLibXml2 : added libxml2_a to find_library()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5232
2020-09-17 09:45:50 -04:00
Brad King 56c80c8c6d Merge topic 'system-includes-for-clang-on-windows'
bb61c2d024 Clang: use -imsvc for system include dirs when running on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !5231
2020-09-17 09:44:55 -04:00
Brad King 6a88e6332f Utilities/Release: Drop now-unused scripts
Since these commits:

* commit ab2276e6b9 (Utilities/Release: remove old macOS release script,
                     2020-09-16)
* commit 7670ba8b0a (Utilities/Release: Drop win{32,64} scripts in favor
                     of docker build, 2020-05-05, v3.18.0-rc1~203^2)
* commit 689fdbfc61 (Utilities/Release: Drop linux64 script in favor of
                     docker build, 2019-08-27, v3.16.0-rc1~184^2)

several scripts we once used for producing release binaries for
distribution on `cmake.org` are no longer needed.
2020-09-17 09:11:03 -04:00
Michael Hirsch 4d292aecb6 FindMatlab: add R2020b => 9.9 2020-09-17 08:58:21 -04:00
Kitware Robot bdc752e3d5 CMake Nightly Date Stamp 2020-09-17 00:01:17 -04:00
Brad King 10e7aff716 Merge topic 'ci-macos-package'
ab2276e6b9 Utilities/Release: remove old macOS release script
9671282bcc gitlab-ci: add a job to upload macOS binaries
5138be9558 ci: use a pre-built Qt for macOS packages
8ff3ce730d gitlab-ci: add a job to make macOS packages
7d4ec05c6f gitlab-ci: add a job to make a doc "bundle"
f0aaf24f08 gitlab-ci: always place the build directory at the top
3a96ea903f ci: remove extra newline
758a8592ed Utilities: also support an already extracted doc tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5227
2020-09-16 16:20:19 -04:00
Ben Boeckel ab2276e6b9 Utilities/Release: remove old macOS release script
macOS releases are now made by GitLab-CI.
2020-09-16 16:09:01 -04:00
Ben Boeckel 9671282bcc gitlab-ci: add a job to upload macOS binaries 2020-09-16 16:09:01 -04:00
Ben Boeckel 5138be9558 ci: use a pre-built Qt for macOS packages 2020-09-16 16:09:01 -04:00
Olivier LIESS fa258f175d FindLibXml2 : added libxml2_a to find_library()
This should match the default static library name defined by LibXml2 Makefile.msvc
2020-09-16 21:41:45 +02:00
Ben Boeckel 8ff3ce730d gitlab-ci: add a job to make macOS packages 2020-09-16 14:03:31 -04:00
Brad King f9fd0a0ea2 Merge branch 'release-3.18' into master 2020-09-16 13:59:11 -04:00
Peter Steneteg 8eab76eb84 string(JSON): Adds JSON parsing support to the string command
Adds a set of sub commands to the string command for parsing JSON, the
JSON commands are: GET, TYPE, MEMBER, LENGTH, REMOVE, SET, and EQUAL.

Closes: #19501
2020-09-16 13:55:24 -04:00
Ronald Hiemstra 818c6948da FindDoxygen: build the generated file contents using temporary strings
Incrementally writing to a file, could result in write (permission
denied) errors.  Those errors are probably due to file-monitoring
processes having a temporary lock on a generated file.  The implemented
solution builds the content of the generated file as string and in the
end the built string is written to the generated file.

Fixes: #21190
2020-09-16 13:48:04 -04:00
Ben Boeckel 7d4ec05c6f gitlab-ci: add a job to make a doc "bundle"
This can be added to any other platform's package by reusing the
artifact.
2020-09-16 13:35:53 -04:00
Ben Boeckel f0aaf24f08 gitlab-ci: always place the build directory at the top 2020-09-16 13:35:53 -04:00
Ben Boeckel 3a96ea903f ci: remove extra newline 2020-09-16 13:35:53 -04:00
Ben Boeckel 758a8592ed Utilities: also support an already extracted doc tree 2020-09-16 13:35:53 -04:00
Brad King 62c4c3c7f4 Merge topic 'flexiblas'
68349ae214 Find{BLAS,LAPACK}: Add support for FlexiBLAS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5225
2020-09-16 13:13:49 -04:00
Brad King 360d469395 Merge topic 'CMAKE_LINKER_points_to_lld_link_for_msvc_with_clang_gnu_interface'
013270ef09 Clang: Detect lld-link when using gnu front end with msvc target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5193
2020-09-16 13:12:44 -04:00
Andrew Fuller bb61c2d024 Clang: use -imsvc for system include dirs when running on Windows
Fixes #17808
2020-09-16 10:06:46 -07:00
Kitware Robot b16a3f3301 CMake Nightly Date Stamp 2020-09-16 00:01:19 -04:00
Brad King b7590b8845 Merge topic 'ExternalProject-steps-refinement'
b4fc4da903 ExternalProject: Add policy CMP0114 to refine step target dependencies
f5791e24c6 Tests: Match RunCMake.ExternalProject NO_DEPENDS output more strictly
b637ef494c ExternalProject: Factor out an internal helper to add a step target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5215
2020-09-15 14:38:45 -04:00
Brad King bdcde7762c Merge branch 'release-3.17' into master 2020-09-15 10:00:40 -04:00
Brad King 314039ba45 Help: Update 3.18.2 release notes to mention 3.16.9 and 3.17.5
A change made in 3.18.2 was backported to the 3.16 and 3.17 branches.
Update the 3.18 release note to mention them.
2020-09-15 09:27:56 -04:00
Brad King 42edc1a0b4 Merge branch 'release-3.17' into release-3.18 2020-09-15 09:27:00 -04:00
Brad King 58b37ae201 Merge branch 'release-3.16' into release-3.18 2020-09-15 09:26:48 -04:00
Brad King d90645b788 Merge branch 'release-3.16' into master 2020-09-15 08:52:12 -04:00