summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cmake-initial-cache-relative' into release-3.16Brad King2019-10-1413-10/+40
|\ | | | | | | Merge-request: !3912
| * cmake: Fix relative path regression in -CPeter Waller2019-10-1413-10/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4ca0526f8a (cmake: Pass -S and -B into PreLoad.cmake and -C scripts, 2019-08-20, v3.16.0-rc1~195^2) the value of `CMAKE_SOURCE_DIR` is the source directory rather than the current working directory. This was correct on its own, but the place storing that value is also used as the base for relative paths specified on the command line. The latter should of course be relative to the current working directory. The fix is to switch to use a full path internally, unless a full path is already specified. Add tests for the behaviour of `-C` under these four circumstances: {with -S, without -S} x {full path, relative path} Fixes: #19827
* | Merge branch 'FindOpenMP-clang-HIP-device' into release-3.16Brad King2019-10-141-0/+2
|\ \ | | | | | | | | | Merge-request: !3911
| * | FindOpenMP: Add support for HIP clang device passKonstantin Pyzhov2019-10-121-0/+2
| |/ | | | | | | | | | | | | | | | | | | The HIP clang makes 2 passes when compiling HIP programs: the DEVICE pass and the HOST pass. For openmp, the `-fopenmp` option is only passed to the HOST compilation pass. Therefore, the small test that CMake uses for OpenMP detection fails to compile, and CMake reports failure to detect OpenMP support in the compiler. The suggested solution is to add check for `__HIP_DEVICE_COMPILE__` macro defined by HIP clang for the DEVICE pass to the OpenMP detection test.
* | Merge branch 'no-git-version' into release-3.16Brad King2019-10-111-44/+46
|\ \ | | | | | | | | | Merge-request: !3910
| * | CMakeVersion: Add option to disable Git suffixKyle Edwards2019-10-111-43/+45
| | | | | | | | | | | | | | | | | | | | | Distro maintainers who are building from Git with patches added on may want to disable the automatic Git suffixing, as it does not provide any useful information and simply confuses the end user. Add an undocumented CMake_VERSION_NO_GIT variable to disable this.
| * | CMakeVersion: Prefer Git information provided by 'git archive' exportsBrad King2019-10-111-11/+11
| |/ | | | | | | | | | | | | | | Update the approach from commit fe2c558ba6 (CMakeVersion: Preserve Git information during 'git archive', 2019-07-25, v3.16.0-rc1~337^2) to prefer `export-subst` information. This will allow exported source trees to be imported into unrelated Git repositories while still using the original upstream CMake commit information.
* | Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.16Brad King2019-10-111-0/+7
|\ \ | | | | | | | | | Merge-request: !3909
| * | IRSL: Install vcruntime140_1.dll if availableBrad King2019-10-111-0/+6
| | | | | | | | | | | | | | | | | | | | | VS 2019 now distributes this additional runtime DLL with its `14.2x` toolsets. Fixes: #19829
| * | IRSL: Prefer MSVC runtime libraries from newest toolset firstBrad King2019-10-111-0/+1
| | |
* | | Merge branch 'vs-v142-csharp-flags' into release-3.16Brad King2019-10-112-2/+575
|\ \ \ | | | | | | | | | | | | Merge-request: !3908
| * | | VS: Add toolset v142 CSharp flag tableBrad King2019-10-112-2/+575
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the flag tables for C and C++ were generated from MSBuild `.xml` files, the CSharp flag tables were written by hand. Copy the `v141` flag table to use for the `v142` toolset. Remove the special case added by commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) that mapped the v142 flag table lookup to v141 since we now have the real v142 table. Fixes: #19828
* | | Merge branch 'FindPostgreSQL-macports-and-v12' into release-3.16Brad King2019-10-111-1/+4
|\ \ \ | | | | | | | | | | | | Merge-request: !3907
| * | | FindPostgreSQL: support macports installation schemeBen Boeckel2019-10-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Macports installs into `include/postgresql${suffix}`. Add this to the list of supported suffixes. Also copy the non-server `postgresql/${suffix}` path.
| * | | FindPostgreSQL: support version 12Ben Boeckel2019-10-111-1/+1
| | |/ | |/|
* | | Merge branch 'iar-8051-support' into release-3.16Brad King2019-10-116-3/+23
|\ \ \ | | | | | | | | | | | | Merge-request: !3906
| * | | IAR: Add 8051 supportMicael Borgefeldt2019-10-116-2/+22
| | | | | | | | | | | | | | | | Issue: #17264
| * | | IAR: Fix v850 assembler support file extensionsMicael Borgefeldt2019-10-111-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Fix the file extension added by commit 158f3795b8 (IAR: Add v850 assembler support, 2019-09-23, v3.16.0-rc1~70^2). Issue: #17264
* | | Merge branch 'objc-c++flags' into release-3.16Brad King2019-10-114-1/+29
|\ \ \ | | | | | | | | | | | | Merge-request: !3904
| * | | Objective-C: Do not treat Objective-C files as C++ filesCristian Adam2019-10-114-1/+29
| |/ / | | | | | | | | | | | | When both C and C++ langauges are enabled, the Objective-C files should be treated as C files and not as C++ files.
* | | Merge branch 'doc-unity-build' into release-3.16Brad King2019-10-114-17/+37
|\ \ \ | | | | | | | | | | | | Merge-request: !3905
| * | | Help: Document CMAKE_UNITY_BUILD/CMAKE_EXPORT_COMPILE_COMMANDS limitationBrad King2019-10-113-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These two options currently do not work well together. Mention this limitation in the documentation. Issue: #19826
| * | | Help: Extend documentation of CMAKE_UNITY_BUILD variableBrad King2019-10-111-3/+5
| | | |
| * | | Help: Improve UNITY_BUILD documentation formattingBrad King2019-10-111-15/+15
| | | |
| * | | Help: Document CMAKE_UNITY_BUILD in 3.16 release notesBrad King2019-10-111-0/+4
| |/ /
* | | Merge branch 'intel-19-compile-features' into release-3.16Brad King2019-10-113-4/+30
|\ \ \ | |/ / |/| | | | | Merge-request: !3900
| * | Tests: Update CompileFeatures test for Intel 19 with VS 2015Brad King2019-10-101-0/+6
| | | | | | | | | | | | | | | Blacklist `cxx_relaxed_constexpr` for this case because the compiler does not advertise the support in this mode but compiles our example.
| * | Intel: Fix default C++ dialect detection on WindowsBrad King2019-10-102-4/+24
|/ / | | | | | | | | | | For the Intel Compiler for Windows we have some subtle preprocessor checks in compiler feature detection to detect C++11 and C++14 modes. Use these when detecting the default C++ dialect too.
* | CMake 3.16.0-rc1v3.16.0-rc1Brad King2019-10-101-1/+1
| |
* | Merge branch 'rename_loglevel_option' into release-3.16Brad King2019-10-1020-44/+160
|\ \ | | | | | | | | | Merge-request: !3899
| * | CLI: Rename --loglevel to --log-level for naming consistencyCraig Scott2019-10-1020-44/+160
| | | | | | | | | | | | | | | | | | | | | Other multi-word command line options use hyphens to separate the words, so the --loglevel option introduced in CMake 3.15 was inconsistent in this regard. Rename it to --log-level but still support the original --loglevel name to preserve backward compatibility.
* | | Merge branch 'pch-generate' into release-3.16Brad King2019-10-1015-89/+255
|\ \ \ | | | | | | | | | | | | Merge-request: !3890
| * | | PCH: Generate sources during Compute stepCristian Adam2019-10-0915-89/+255
| | | |
* | | | Merge branch 'ExternalProject-minor-typos' into release-3.16Brad King2019-10-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3898
| * | | | ExternalProject: fix some documentation typosBen Boeckel2019-10-091-2/+2
| | |/ / | |/| |
* | | | Merge branch 'vs-16.4-global-targets' into release-3.16Brad King2019-10-091-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3896
| * | | | VS: Tell VS 16.4 not to verify CMake-provided custom command outputsBrad King2019-10-071-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated. Fixes: #19737
* | | | Merge branch 'file-GENERATE-earlier' into release-3.16Brad King2019-10-094-15/+11
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !3895
| * | | file(GENERATE): Create output file structures even earlierBrad King2019-10-074-15/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b80557c7bd (file(GENERATE): Evaluate early to allow generating source files, 2014-11-04, v3.2.0-rc1~398^2) we create the `cmSourceFile` instances marked with a `GENERATED` source file property before tracing source dependencies. Move it to even earlier so that steps in `cmGlobalGenerator::AddAutomaticSources` can operate on all sources. This also avoids the accidental `O(n^2)` calls for `n` local generators that we had previously. This is also needed since commit 83c1657ff7 (Unity build: Generate sources during Compute step, 2019-10-03) to support `file(GENERATE)` outputs as sources in a target with `UNITY_BUILD` enabled.
* | | Merge branch 'apple-asm-deployment-target' into release-3.16Brad King2019-10-091-0/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !3894
| * | | Apple: Set Clang ASM compiler featuresGregor Jasny2019-10-091-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | The same is done for the C and CXX language. This initializes compiler flags like the sysroot path or deployment target. Closes: #19794 Suggested-by: Kyle Fleming
* | | Begin 3.16 release versioningBrad King2019-10-071-3/+3
| | |
* | | Help: Drop development topic notes to prepare releaseBrad King2019-10-072-9/+0
|/ / | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | Merge topic 'doc-3.16-relnotes'Brad King2019-10-0744-295/+271
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | ffa1c76ba3 Help: Add missing 3.16 release notes for CPack/DEB descriptions a933d8d84e Help: Organize and revise 3.16 release notes 9c9a6e6023 Help: Consolidate 3.16 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3889
| * | Help: Add missing 3.16 release notes for CPack/DEB descriptionsBrad King2019-10-071-0/+8
| | | | | | | | | | | | | | | | | | | | | Add notes for the changes from commit 33c7ea513d (CPackDeb: Use `CPACK_PACKAGE_DESCRIPTION_FILE`, 2019-07-11). Suggested-by: Alex Turbov <i.zaufi@gmail.com>
| * | Help: Organize and revise 3.16 release notesBrad King2019-10-071-135/+178
| | | | | | | | | | | | | | | | | | Add section headers similar to the 3.15 release notes and move each individual bullet into an appropriate section. Revise a few bullets. Drop bullets covering internal interfaces.
| * | Help: Consolidate 3.16 release notesBrad King2019-10-0444-295/+220
| | | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.16.rst`.
* | | Merge topic 'doc_custom_commands_crosscompile'Brad King2019-10-072-25/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c6f08a2125 Help: Clarify how target names are handled in custom commands/targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3891
| * | | Help: Clarify how target names are handled in custom commands/targetsCraig Scott2019-10-052-25/+45
| | | | | | | | | | | | Fixes: #19771
* | | | Merge topic 'export-genex-under-prefix'Brad King2019-10-072-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ded5b6da8 install,export: Fix export of a genex following $<INSTALL_PREFIX> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3886