Commit Graph

39867 Commits

Author SHA1 Message Date
Roger Leigh c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1
This includes a new component, `Boost::contract`.

Fixes: #18167
2018-07-11 07:26:51 -04:00
Brad King 7f1569d2d8 CMake 3.12.0-rc3 v3.12.0-rc3 2018-07-09 08:06:27 -04:00
Brad King 855dafdda0 Merge branch 'csharp-link-file' into release-3.12
Merge-request: !2177
2018-07-09 07:32:35 -04:00
Robert Dailey 8a6107650e VS: Only link cs files when they're not in binary dir
When `*.cs` files are provided, do not generate a `<Link>` element in
the `.csproj` project if those files are descendants of
`CMAKE_CURRENT_BINARY_DIR`. This comparison happens for each file.
2018-07-06 09:45:15 -04:00
Brad King 0f3d7a1398 Merge branch 'doc-add_compile_definitions' into release-3.12
Merge-request: !2192
2018-07-05 10:23:20 -04:00
Marc Chevrier 89e3e62e13 Help: fix add_compile_definitions() documentation
Fixes: #18147
2018-07-05 10:21:09 -04:00
Brad King 84ecbf44b6 Merge branch 'revert-subdirectory-linking' into release-3.12
Merge-request: !2191
2018-07-03 12:54:32 -04:00
Brad King 890be0145d Merge branch 'FindLua-CMP0012' into release-3.12
Merge-request: !2189
2018-07-03 12:54:24 -04:00
Brad King f598166124 Merge branch 'backport-UseSWIG-legacy-targets' into release-3.12
Merge-request: !2188
2018-07-03 12:54:13 -04:00
Marc Chevrier 38ffcedd26 UseSWIG: reintroduce legacy target name management
Fixes: #18140
2018-07-03 12:46:59 -04:00
Adriaan de Groot 91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code
Code added by commit v3.12.0-rc1~53^2 (FindLua: Search for lua.h using
more conventional paths, 2018-05-20) depends on `CMP0012` NEW behavior.
Set the policy explicitly for the scope of the FindLua module.

Fixes: #18142
2018-07-03 11:23:22 -04:00
Brad King 0d7114987c Revert "target_link_libraries: Allow use with targets in other directories"
Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with
targets in other directories, 2018-05-11).  The RHS target scoping and
visibility rules are not clear and will need further investigation
before the feature can be added.

Issue: #17943
2018-07-03 09:39:28 -04:00
Brad King 39851a6d43 Merge branch 'cpack-fix-deb-packaging' into release-3.12
Merge-request: !2178
2018-07-02 13:19:54 -04:00
Andrew Fuller 2774259100 CPack/Deb: Restore setting of root as the owner of files
Refactoring in commit v3.10.0-rc1~220^2 (cmCPackDebGenerator: Use
libarchive to create .deb file) accidentally broke this for the
top-level archive.
2018-07-02 13:17:43 -04:00
Brad King ea6ad5e4be Merge branch 'policy_max_docs' into release-3.12
Merge-request: !2180
2018-07-02 11:48:00 -04:00
Craig Scott 19f338109d Help: Clarify ...<max> behavior for policy-related commands
Affects cmake_minimum_required() and cmake_policy(VERSION)
2018-07-02 08:41:46 +10:00
Brad King 51e7d41507 CMake 3.12.0-rc2 v3.12.0-rc2 2018-06-29 09:03:08 -04:00
Brad King d43c9152a6 Merge branch 'FindOpenMP-avoid-warning-in-check' into release-3.12
Merge-request: !2176
2018-06-27 15:27:21 -04:00
Brad King 826bf5c454 FindOpenMP: Avoid warning in check code
The test code added by commit v3.12.0-rc1~411^2~1 (FindOpenMP: Verify in
test source that OMP library is linked, 2018-03-01) leaves an unused
variable warning.  This breaks the check with `-Werror`.  Remove the
variable and leave just the function call, which should still check that
the OMP library is linked.

Fixes: #18102
2018-06-27 15:24:22 -04:00
Brad King decfdec63f Merge branch 'ctest_submit-https' into release-3.12
Merge-request: !2171
2018-06-27 15:10:56 -04:00
Zack Galbreath 71f27c04b0 ctest_submit: show headers as debug info
Hide any headers specified by `ctest_submit(HTTPHEADER ...)` unless ctest
is run with --debug.  This option is used to present bearer tokens to CDash.
We do not want to inadvertently expose this secret data in the console
output log.
2018-06-27 15:08:14 -04:00
Zack Galbreath 4464ef21da ctest_submit: Check CA file during CDASH_UPLOAD
This fixes a bug where ctest(SUBMIT CDASH_UPLOAD ...) would fail when
attemping to submit to a site bearing a genuine SSL certificate.
This code path was missing a call to cmCurlSetCAInfo() which loads
the certificate authority file.
2018-06-27 15:08:14 -04:00
Brad King 2ba71a11e3 Merge branch 'lexer-null' into release-3.12
Merge-request: !2174
2018-06-26 13:04:25 -04:00
Brad King b29842a818 ListFileLexer: Do not match null bytes in input
Extend the fix from commit v3.10.0-rc1~188^2 (ListFileLexer: fix
heap-buffer-overflow on malicious input, 2017-08-26) to apply to all
lexer token matches.  Replace all `.` with `[^\0\n]`.  Update all
`[^...]` match expressions to not match `\0`.

We cannot safely process null bytes in strings.

Fixes: #18124
2018-06-26 11:54:34 -04:00
Brad King b2b3872f22 Merge branch 'FindMatlab-doc-mcr' into release-3.12
Merge-request: !2173
2018-06-26 11:28:40 -04:00
Brad King 27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support
This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab:
Matlab Runtime Compiler support, 2018-04-29).
2018-06-26 11:12:19 -04:00
Brad King 7e283acde7 Merge branch 'libuv-new-version-file-location' into release-3.12
Merge-request: !2169
2018-06-25 10:17:38 -04:00
Raphael Kubo da Costa 889033b5c6 FindLibUV: Also check uv/version.h for version detection
Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
Make FindLibUV aware of the file's new location for configuration to work.
2018-06-25 10:16:46 -04:00
Brad King 00523ad9c5 Merge branch 'vs-filter-default-toolset' into release-3.12
Merge-request: !2162
2018-06-25 09:39:30 -04:00
Basil Fierz 3c4698da3a VS: Allow toolset version selection to specify default toolset
Teach the feature added by commit v3.12.0-rc1~38^2 (VS: Add option to
select the version of the toolset used by VS 2017, 2018-05-19) to accept
the default toolset version in addition to older versions.  If the
default toolset version is supplied, simply clear it so the default will
be used.

Fixes: #18107
2018-06-24 10:36:03 -04:00
Basil Fierz b759f7068f cmVSSetupHelper: Expose default toolset version
We already detect the VS toolset version.  Expose it to clients.
2018-06-22 10:07:09 -04:00
Brad King d548994afc cmVSSetupHelper: Use in-class member initialization 2018-06-22 10:07:09 -04:00
Brad King 221f8aa7e2 Merge branch 'file-GLOB-remove-new-errors' into release-3.12
Merge-request: !2164
2018-06-22 09:42:07 -04:00
Brad King 142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions
Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand,
2018-02-13) introduced error diagnostics for argument combinations that
were previously accepted.  Restore acceptance to avoid regressing
projects that used those combinations even if they do not make sense.

Fixes: #18097
2018-06-22 09:39:05 -04:00
Brad King 5dc9f440c5 Merge branch 'FindJPEG-fix-debug' into release-3.12
Merge-request: !2159
2018-06-21 10:50:48 -04:00
Andrey Karpov ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
These have been deprecated since 2002!
2018-06-21 10:47:03 -04:00
Andrey Karpov 7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration
The change in commit v3.12.0-rc1~202^2~1 (FindJPEG: Add multi config
support and associated docs, 2018-04-17) accidentally left out the
default jpeg library names from consideration for debug variants.
2018-06-21 10:47:03 -04:00
Brad King ecbaed7ad6 Merge branch 'vs-cuda-no-host-includes' into release-3.12
Merge-request: !2158
2018-06-20 09:45:26 -04:00
Brad King 735529f505 Merge branch 'vs-cuda-maxrregcount' into release-3.12
Merge-request: !2156
2018-06-20 09:45:08 -04:00
Brad King 543b6826ee VS: Avoid duplication of CUDA include directories
We already place all include directories for CUDA inside `CudaCompile`
so we do not need to use any from `ClCompile`.  Tell `CudaCompile`
not to use the host compiler's include directory settings.

Fixes: #18101
2018-06-20 09:44:18 -04:00
Brad King 4d3a3d7459 VS: Add CUDA flag table entry for -maxrregcount
Fixes: #18104
2018-06-20 09:44:09 -04:00
Brad King a7074007a7 Merge branch 'xcode-10-legacy-build-system' into release-3.12
Merge-request: !2151
2018-06-19 11:15:32 -04:00
Brad King ca69206893 Tests: Do not use i386 architecture with Xcode 10 and above
Xcode 10 dropped support for i386 builds.
2018-06-19 11:14:43 -04:00
Brad King 71fa78ff7a Tests: Teach RunCMake to ignore Xcode missing file type warnings
Xcode 10 beta warns

    xcodebuild... warning: file type '::com.apple.instruments.instrdst'
    is based on missing file type 'default::com.apple.package'

Teach RunCMake to drop such lines before matching against expected
output.
2018-06-19 10:56:50 -04:00
Gregor Jasny 057ecb8f6f C++ feature checks: Ignore Xcode warnings 2018-06-19 10:56:50 -04:00
Gregor Jasny 985d3a162c Xcode: Use legacy build system
Closes: #18099
2018-06-19 10:56:50 -04:00
Brad King a044006a32 Merge branch 'xcode-10-archs' into release-3.12
Merge-request: !2153
2018-06-19 09:24:37 -04:00
Brad King a9a6606635 Merge branch 'FindCURL-target-name' into release-3.12
Merge-request: !2154
2018-06-19 09:24:19 -04:00
Brad King 1e356734a7 FindCURL: Rename imported target to match upstream CURL
Upstream CURL provides imported target `CURL::libcurl`.  Rename the
target added by `FindCURL` to match.  We don't need compatibility with
the old name because it has never been in a CMake release (except a 3.12
release candidate).

Suggested-by: Jakub Zakrzewski <slither.jz@gmail.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Fixes: #18091
2018-06-18 13:58:21 -04:00
Brad King bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH
Xcode 10 no longer populates `CURRENT_ARCH` with the current
architecture in shell scripts and instead uses `undefined_arch`.
Instead we must use `ARCHS`.  It lists all architectures separated by
spaces.

Fixes: #18085
2018-06-18 13:44:43 -04:00