summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPkgConfig-scope' into release-3.17Brad King2020-02-251-0/+6
|\ | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
| * FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| | | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
* | Merge topic 'cuda-non-device-link' into release-3.17Brad King2020-02-252-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7da2c8c543 Merge branch 'backport-cuda-non-device-link' 738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4376
| * \ Merge branch 'backport-cuda-non-device-link'Brad King2020-02-242-3/+3
| |\ \
| | * | Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file` option to avoid long link command lines via a response file. However, for non-device linking the host tools are used and the option does not make sense. Update the logic to use `--options-file` only for device linking. Linking with the host tools already has its own logic for response files. Fixes: #19954
* | | | Merge topic 'pch-create-via-include' into release-3.17Brad King2020-02-243-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
| * | | | PCH: Clang: Update PCH usage flags to include original headerSergey Larin2020-02-243-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an additional include flag to PCH usage command line to fix programs that rely on `compile_commands.json` file. Pass it to the preprocessor directly to avoid compiler driver to change it to '-include-pch'. When preprocessor is requested to preprocess a file, it tries to get the original filename from '.pch' and uses that file for preprocessing. CMake generates a '.pch' file from the '.hxx' file by passing an empty '.cxx' source file to the compiler as a compilation unit and the header file with the '-include' flag. After that, compiler puts compilation unit filename in the '.pch' as the original filename. However, CMake build system uses empty file as the source file and passes the header file using '-include-pch' flag. As a result, Clang uses the wrong file for preprocessing and produces the corrupted preprocessed file. Fixes: #20355 Signed-off-by: Sergey Larin <cerg2010cerg2010@mail.ru>
* | | | Merge topic 'update-kwsys' into release-3.17Brad King2020-02-182-6/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4361
| * | | | KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursionBrad King2020-02-182-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWSys commit `ea77593a1` (SystemTools: CopyFileIfDifferent: Fix endless recursion, 2020-02-13) for the CMake 3.17 branch. Fixes: #20347
* | | | | Merge topic 'swift-exe-rpath' into release-3.17Brad King2020-02-181-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 321df5783d Swift: support `-rpath` for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4365
| * | | | | Swift: support `-rpath` for executablesSaleem Abdulrasool2020-02-171-0/+5
| | |/ / / | |/| | | | | | | | | | | | | This adjusts the flags to enable setting the RPATH for executables.
* | | | | Merge topic 'ninja-multi-framework-dependency-autogen-fix' into release-3.17Brad King2020-02-1829-87/+152
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4363
| * | | | | Ninja Multi-Config: Fix issue with framework dependencies and AutogenKyle Edwards2020-02-1729-87/+152
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20345
* | | | | | Merge topic 'git-config-with-spaces' into release-3.17Brad King2020-02-175-13/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 40d1d29cfa Tests: Add missing ExternalProject smoke tests afc8956765 Tests: Fix test_clean target missing some test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4364
| * | | | | ExternalProject: Quote each git --config option to handle spacesCraig Scott2020-02-152-2/+4
| | | | | | | | | | | | | | | | | | Fixes: #20354
| * | | | | Tests: Add missing ExternalProject smoke testsCraig Scott2020-02-151-0/+8
| | | | | |
| * | | | | Tests: Fix test_clean target missing some test directoriesCraig Scott2020-02-153-11/+16
| |/ / / /
* | | | | Merge topic 'doc-ascii' into release-3.17Brad King2020-02-122-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4358
| * | | | Help: Replace UTF-8 apostrophe with ascii apostropheBrad King2020-02-122-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | Also replace UTF-8 graphical characters with simple dashes. Fixes: #20349
* | | | CMake 3.17.0-rc1v3.17.0-rc1Brad King2020-02-121-1/+1
| | | |
* | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4353
| * | | | Help: module CPack: Make internal hyperlink target more uniqueBrad King2020-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | We already have a `.. _targets:` in `Help/command/install.rst`.
* | | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-10/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59e9f33d78 Help: module CPack: New section on targets. f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7). 4949e1261a Help: module CPack. Explain usage of the build targets. 72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1 c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4352
| * | | | Help: module CPack: New section on targets.Joachim Wuttke (o)2020-02-121-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | To explain in full detail to what extent the targets package and package_source are supported by different generators.
| * | | | Help: module CPack: add cross-reference to cpack-generators(7).Joachim Wuttke (o)2020-02-121-0/+2
| | | | |
| * | | | Help: module CPack. Explain usage of the build targets.Joachim Wuttke (o)2020-02-121-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Explain the usage of the two new build targets, package and package_source.
| * | | | Help: module CPack: correction: 2 config files are generated, not just 1Joachim Wuttke (o)2020-02-121-3/+4
| | | | | | | | | | | | | | | | | | | | Besides CPackConfig.cmake, the module also generates CPackSourceConfig.cmake.
| * | | | Help: CPack module: Correct the summary (configure, not build)Joachim Wuttke (o)2020-02-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | Including CPack does not "build" installers. It just *configures* them.
* | | | Merge topic 'PrintSystemInformation' into release-3.17Brad King2020-02-121-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e9328a00d Help: CMakePrintSystemInformation.cmake: Minor corrections. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4351
| * | | | Help: CMakePrintSystemInformation.cmake: Minor corrections.Joachim Wuttke (o)2020-02-121-2/+2
| |/ / / | | | | | | | | | | | | | | | | Punctuation. "file" -> "module"
* | | | Merge topic 'cpack-ifw-qt-links' into release-3.17Brad King2020-02-122-38/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF 78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4348
| * | | | Help: CPackIFWGenerator: explain relation to CPackIWFJoachim Wuttke (o)2020-02-112-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | * Make overview more focussed * Explain the relation to CPackIFW
| * | | | Help: Show external link only once per page; explain abbreviation QtIFW.Joachim Wuttke (o)2020-02-112-31/+26
| |/ / /
* | | | Merge topic 'ninja-multi-default-configs-fix' into release-3.17Brad King2020-02-125-6/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4349
| * | | | Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGSKyle Edwards2020-02-115-6/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this fix, CMAKE_NMC_DEFAULT_CONFIGS would inherit "all" from the union of CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG and CMAKE_NMC_CROSS_CONFIGS. This is inconsistent with the behavior of the "all" target signifying CMAKE_NMC_CROSS_CONFIGS. Update "all" in CMAKE_NMC_DEFAULT_CONFIGS to inherit only from CMAKE_NMC_CROSS_CONFIGS.
* | | | | Merge topic 'file-CONFIGURE_DEPENDS-verify-CMP0009' into release-3.17Brad King2020-02-127-3/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009 715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4342
| * | | | | file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to newShane Parris2020-02-116-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases, rebuilds with CMake using the CONFIGURE_DEPENDS flag with GLOB_RECURSE could result in a reconfigure loop due to CMP0009 not being propogated to the generated VerifyGlobs.cmake script. During the inital configuration phase, RecurseThroughSymlinksOn() is called for recursive glob operations either by having the CMP0009 status not set to NEW or by explicitly providing the FOLLOW_SYMLINKS flag. At the end when the VerifyGlobs script is created, the FOLLOW_SYMLINKS flag is written according to the final resolved form through a call to GetRecurseThroughSymlinks(). Thus, setting CMP0009 to NEW in the generated file is safe and allows correct behavior whether or not the end user sets the policy status to NEW or OLD.
| * | | | | file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009Shane Parris2020-02-111-1/+1
| | | | | |
| * | | | | Tests: Perform minor cleanups in RunCMake.file testShane Parris2020-02-111-2/+2
| | |/ / / | |/| | |
* | | | | Merge topic 'install-default-fix' into release-3.17Brad King2020-02-127-18/+50
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 9442ae5083 install: Fix regression when using default destinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4340
| * | | | install: Fix regression when using default destinationsKyle Edwards2020-02-117-18/+50
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression was introduced, in which an `install(TARGETS)` with a RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER DESTINATION would then install the headers. The old behavior did not do this. Restore the old behavior. Fixes: #20326
* | | | Merge topic 'link-line-backtrace' into release-3.17Brad King2020-02-119-93/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace' e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Dennis Klein <d.klein@gsi.de> Merge-request: !4344
| * \ \ \ Merge branch 'backport-3.16-link-line-backtrace'Brad King2020-02-109-93/+85
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Propagate backtraces from LINK_LIBRARIES through to link line itemsBrad King2020-02-109-93/+85
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d4d0dd0f6a (cmLinkLineComputer: Add ComputeLinkLibs overload with backtraces, 2019-09-13, v3.16.0-rc1~87^2~4), backtraces have been collected by `ComputeLinkLibs` by looking back through the link implementation libraries for one matching the text of the link line item. This is slow in projects with long link lines. Instead, teach `cmComputeLinkDepends` and `cmComputeLinkInformation` to carry backtrace information explicitly along with the text of each item. Fixes: #20322
* | | | Merge topic 'ExternalProject-submodules-recurse' into release-3.17Brad King2020-02-111-19/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ba8010255 ExternalProject: Fix git submodule recursion on update Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4346
| * | | | ExternalProject: Fix git submodule recursion on updateCharis Marangos2020-02-101-19/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 5bc6230741 (ExternalProject: Option to turn off recursive update of git submodules, 2019-10-16) we implemented the feature in the clone script written by `_ep_write_gitclone_script` but not in the update script written by `_ep_write_gitupdate_script`. Implement the latter by factoring out a common helper to use in both places. Fixes: #20335
* | | | Merge topic 'FindOpenMP-clang-windows' into release-3.17Brad King2020-02-111-7/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceb5ee4a7b FindOpenMP: Add support for Clang on Windows 2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4327
| * | | | FindOpenMP: Add support for Clang on WindowsTim Hutton2020-02-101-1/+20
| | | | | | | | | | | | | | | | | | | | Fixes: #19404
| * | | | FindOpenMP: Save flags/libs in cache entries each time they are detectedTim Hutton2020-02-101-6/+5
| |/ / /
* | | | Merge topic 'FindPython-reduce-resources-comsumption' into release-3.17Brad King2020-02-112-88/+138
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dab4682f6 FindPython: reduces consumption of resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4338
generated by cgit v0.12 at 2025-01-30 21:54:16 (GMT)