summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.12.0-rc3v3.12.0-rc3Brad King2018-07-091-1/+1
|
* Merge branch 'csharp-link-file' into release-3.12Brad King2018-07-091-4/+7
|\ | | | | | | Merge-request: !2177
| * VS: Only link cs files when they're not in binary dirRobert Dailey2018-07-061-4/+7
| | | | | | | | | | | | 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.
* | Merge branch 'doc-add_compile_definitions' into release-3.12Brad King2018-07-051-3/+3
|\ \ | | | | | | | | | Merge-request: !2192
| * | Help: fix add_compile_definitions() documentationMarc Chevrier2018-07-051-3/+3
| | | | | | | | | | | | Fixes: #18147
* | | Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-0318-107/+10
|\ \ \ | | | | | | | | | | | | Merge-request: !2191
| * | | Revert "target_link_libraries: Allow use with targets in other directories"Brad King2018-07-0318-107/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'FindLua-CMP0012' into release-3.12Brad King2018-07-031-0/+5
|\ \ \ | | | | | | | | | | | | Merge-request: !2189
| * | | FindLua: Set CMP0012 to NEW for the revised search codeAdriaan de Groot2018-07-031-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'backport-UseSWIG-legacy-targets' into release-3.12Brad King2018-07-035-53/+115
|\ \ \ | |_|/ |/| | | | | Merge-request: !2188
| * | UseSWIG: reintroduce legacy target name managementMarc Chevrier2018-07-035-53/+115
| |/ | | | | | | Fixes: #18140
* | Merge branch 'cpack-fix-deb-packaging' into release-3.12Brad King2018-07-021-0/+6
|\ \ | | | | | | | | | Merge-request: !2178
| * | CPack/Deb: Restore setting of root as the owner of filesAndrew Fuller2018-07-021-0/+6
| |/ | | | | | | | | | | Refactoring in commit v3.10.0-rc1~220^2 (cmCPackDebGenerator: Use libarchive to create .deb file) accidentally broke this for the top-level archive.
* | Merge branch 'policy_max_docs' into release-3.12Brad King2018-07-023-2/+10
|\ \ | |/ |/| | | Merge-request: !2180
| * Help: Clarify ...<max> behavior for policy-related commandsCraig Scott2018-07-023-2/+10
|/ | | Affects cmake_minimum_required() and cmake_policy(VERSION)
* CMake 3.12.0-rc2v3.12.0-rc2Brad King2018-06-291-1/+1
|
* Merge branch 'FindOpenMP-avoid-warning-in-check' into release-3.12Brad King2018-06-271-1/+1
|\ | | | | | | Merge-request: !2176
| * FindOpenMP: Avoid warning in check codeBrad King2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'ctest_submit-https' into release-3.12Brad King2018-06-274-9/+14
|\ \ | | | | | | | | | Merge-request: !2171
| * | ctest_submit: show headers as debug infoZack Galbreath2018-06-274-9/+12
| | | | | | | | | | | | | | | | | | | | | 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.
| * | ctest_submit: Check CA file during CDASH_UPLOADZack Galbreath2018-06-271-0/+2
| |/ | | | | | | | | | | | | 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.
* | Merge branch 'lexer-null' into release-3.12Brad King2018-06-266-103/+106
|\ \ | | | | | | | | | Merge-request: !2174
| * | ListFileLexer: Do not match null bytes in inputBrad King2018-06-266-103/+106
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'FindMatlab-doc-mcr' into release-3.12Brad King2018-06-261-0/+3
|\ \ | | | | | | | | | Merge-request: !2173
| * | Help: Add 3.12 release note for FindMatlab MCR supportBrad King2018-06-261-0/+3
| |/ | | | | | | | | This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime Compiler support, 2018-04-29).
* | Merge branch 'libuv-new-version-file-location' into release-3.12Brad King2018-06-251-0/+2
|\ \ | | | | | | | | | Merge-request: !2169
| * | FindLibUV: Also check uv/version.h for version detectionRaphael Kubo da Costa2018-06-251-0/+2
| |/ | | | | | | | | 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.
* | Merge branch 'vs-filter-default-toolset' into release-3.12Brad King2018-06-256-27/+73
|\ \ | | | | | | | | | Merge-request: !2162
| * | VS: Allow toolset version selection to specify default toolsetBasil Fierz2018-06-244-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | cmVSSetupHelper: Expose default toolset versionBasil Fierz2018-06-222-0/+15
| | | | | | | | | | | | We already detect the VS toolset version. Expose it to clients.
| * | cmVSSetupHelper: Use in-class member initializationBrad King2018-06-221-9/+4
| |/
* | Merge branch 'file-GLOB-remove-new-errors' into release-3.12Brad King2018-06-227-28/+12
|\ \ | | | | | | | | | Merge-request: !2164
| * | file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressionsBrad King2018-06-227-28/+12
| |/ | | | | | | | | | | | | | | | | 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
* | Merge branch 'FindJPEG-fix-debug' into release-3.12Brad King2018-06-211-7/+1
|\ \ | | | | | | | | | Merge-request: !2159
| * | FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variablesAndrey Karpov2018-06-211-6/+0
| | | | | | | | | | | | These have been deprecated since 2002!
| * | FindJPEG: Add forgotten names of libraries for Debug configurationAndrey Karpov2018-06-211-1/+1
| |/ | | | | | | | | | | 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.
* | Merge branch 'vs-cuda-no-host-includes' into release-3.12Brad King2018-06-201-0/+1
|\ \ | | | | | | | | | Merge-request: !2158
| * | VS: Avoid duplication of CUDA include directoriesBrad King2018-06-201-0/+1
| |/ | | | | | | | | | | | | | | 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
* | Merge branch 'vs-cuda-maxrregcount' into release-3.12Brad King2018-06-201-0/+3
|\ \ | | | | | | | | | Merge-request: !2156
| * | VS: Add CUDA flag table entry for -maxrregcountBrad King2018-06-201-0/+3
| |/ | | | | | | Fixes: #18104
* | Merge branch 'xcode-10-legacy-build-system' into release-3.12Brad King2018-06-196-29/+49
|\ \ | | | | | | | | | Merge-request: !2151
| * | Tests: Do not use i386 architecture with Xcode 10 and aboveBrad King2018-06-192-17/+21
| | | | | | | | | | | | Xcode 10 dropped support for i386 builds.
| * | Tests: Teach RunCMake to ignore Xcode missing file type warningsBrad King2018-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | C++ feature checks: Ignore Xcode warningsGregor Jasny2018-06-191-0/+2
| | |
| * | Xcode: Use legacy build systemGregor Jasny2018-06-192-12/+25
| | | | | | | | | | | | Closes: #18099
* | | Merge branch 'xcode-10-archs' into release-3.12Brad King2018-06-197-13/+20
|\ \ \ | |/ / | | | | | | Merge-request: !2153
| * | Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCHBrad King2018-06-187-13/+20
| |/ | | | | | | | | | | | | | | | | 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
* | Merge branch 'FindCURL-target-name' into release-3.12Brad King2018-06-192-6/+6
|\ \ | |/ |/| | | Merge-request: !2154
| * FindCURL: Rename imported target to match upstream CURLBrad King2018-06-182-6/+6
|/ | | | | | | | | | | 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
* Merge branch 'sphinx-info' into release-3.12v3.12.0-rc1Brad King2018-06-133-2/+42
|\ | | | | | | Merge-request: !2146
View Lorry Controller Status