summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake_command: Add command to EVAL a CMake script as a stringCristian Adam2020-03-0324-37/+183
|
* Merge topic 'cmake_command-command'Brad King2020-02-2729-0/+164
|\ | | | | | | | | | | | | | | 54e4f2ad45 cmake_command: Add command to INVOKE other commands by name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4286
| * cmake_command: Add command to INVOKE other commands by nameCristian Adam2020-02-2529-0/+164
| | | | | | | | Fixes: #18392
* | Merge topic 'execute_process_exclusive_capture'Brad King2020-02-278-8/+63
|\ \ | | | | | | | | | | | | | | | | | | | | | 6ec274b002 execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Merge-request: !4383
| * | execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE optionsCristian Adam2020-02-248-8/+63
| | | | | | | | | | | | Fixes: #20378
* | | Merge topic 'gen-tgt'Brad King2020-02-271-31/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d98064f156 Help: cmake-generator-expressions(7): Target-Dependent Queries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4378
| * | | Help: cmake-generator-expressions(7): Target-Dependent QueriesJoachim Wuttke (h)2020-02-251-31/+37
| | | | | | | | | | | | | | | | | | | | Explain ``tgt`` at beginning of section. Then refer to ``tgt`` without redundant reexplanations.
* | | | Merge topic 'doc-cpack-ifw'Brad King2020-02-271-38/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af49def54 Help: CPackIFW generator: offline installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4379
| * | | | Help: CPackIFW generator: offline installerJoachim Wuttke (o)2020-02-201-38/+45
| |/ / / | | | | | | | | | | | | | | | | Bundle subsections under "Other Settings". Improve explanation of the Online installer.
* | | | Merge branch 'release-3.17'Brad King2020-02-270-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'pch-file-time' into release-3.17Brad King2020-02-271-0/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e9b9fe918 PCH: Copy the timestamp from an absolute header file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4400
* | \ \ \ \ Merge topic 'pch-file-time'Brad King2020-02-271-0/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e9b9fe918 PCH: Copy the timestamp from an absolute header file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4400
| * | | | | PCH: Copy the timestamp from an absolute header fileCristian Adam2020-02-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `target_precompile_headers` contains a file from the project, then CMake will set the timestamp for `cmake_pch.h|xx` from that file. This helps with ccache and precompile headers. Fixes: #19923
* | | | | | Merge branch 'release-3.17'Brad King2020-02-270-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'update-kwsys' into release-3.17Brad King2020-02-271-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06702acb28 KWSys: Terminal: Add st-256color to VT100 color support whitelist Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4394
* | \ \ \ \ \ Merge topic 'update-kwsys'Brad King2020-02-274-6/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbb235efb9 Merge branch 'backport-kwsys-terminal-st' into update-kwsys 06702acb28 KWSys: Terminal: Add st-256color to VT100 color support whitelist 71764b88d6 Merge branch 'upstream-KWSys' into update-kwsys 4e8c4c7ebe KWSys 2020-02-25 (b14ce28a) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4394
| * \ \ \ \ \ \ Merge branch 'backport-kwsys-terminal-st' into update-kwsysBrad King2020-02-250-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | KWSys: Terminal: Add st-256color to VT100 color support whitelistBrad King2020-02-251-0/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Backport KWSys commit `44eaaa6e8` (Terminal: Add st-256color to VT100 color support whitelist, 2020-02-19) to CMake 3.17.
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-02-254-6/+77
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-02-25 (b14ce28a)
| | * | | | | | KWSys 2020-02-25 (b14ce28a)KWSys Upstream2020-02-254-6/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit b14ce28a237ec0b0d2743418e18cf41ca6bf3a78 (master). Upstream Shortlog ----------------- Leon Richardt (1): 44eaaa6e Terminal: Add st-256color to VT100 color support whitelist Mathieu Westphal (1): acee32bd Adding DecodeUrl and GetFilePathFromURI methods
* | | | | | | | Merge branch 'release-3.16'Brad King2020-02-270-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'backport-3.16-FindPython-cache-cleanup' into release-3.16Brad King2020-02-271-51/+98
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dc524f2 FindPython: Do not cache computed result variables in CMake 3.16 602d1d82 FindPython: Mark non-public cache entries INTERNAL in CMake 3.16 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4399
| | * | | | | | | | FindPython: Do not cache computed result variables in CMake 3.16Marc Chevrier2020-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the cache. They are always computed from other results and so should not be presented to users in cmake-gui and ccmake to edit. Issue: #20362
| | * | | | | | | | FindPython: Mark non-public cache entries INTERNAL in CMake 3.16Marc Chevrier2020-02-261-48/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache entries named `_Python...` to users in cmake-gui and ccmake. Mark those entries as `INTERNAL` to hide them. Issue: #20362
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindPython-cache-cleanup' into release-3.17Brad King2020-02-271-55/+102
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42c6a1bfee FindPython: Do not cache computed result variables a7b4516e1a FindPython: Mark non-public cache entries INTERNAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4393
* | \ \ \ \ \ \ \ \ \ Merge topic 'FindPython-cache-cleanup'Brad King2020-02-271-55/+102
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42c6a1bfee FindPython: Do not cache computed result variables a7b4516e1a FindPython: Mark non-public cache entries INTERNAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4393
| * | | | | | | | | | FindPython: Do not cache computed result variablesMarc Chevrier2020-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the cache. They are always computed from other results and so should not be presented to users in cmake-gui and ccmake to edit. Issue: #20362
| * | | | | | | | | | FindPython: Mark non-public cache entries INTERNALMarc Chevrier2020-02-261-52/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache entries named `_Python...` to users in cmake-gui and ccmake. Mark those entries as `INTERNAL` to hide them. Issue: #20362
* | | | | | | | | | | Merge topic 'FindSWIG-components'Marc Chevrier2020-02-2710-14/+90
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e131d9f974 FindSWIG: Add COMPONENTS support for SWIG target languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4384
| * | | | | | | | | | | FindSWIG: Add COMPONENTS support for SWIG target languagesSeth R Johnson2020-02-2610-14/+90
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of SWIG drop support for some target languages, and some forks of SWIG (such as for Fortran and MATLAB) aren't supported by the mainline version of SWIG. Swig versions as old as 1.3.6 (circa 2001) and possibly older use the same format for listing available wrappers "%-15s - Generate %s wrappers", so component detection should be quite reliable.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-271-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'vs-sln-deploy'Brad King2020-02-268-18/+129
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c944da757 VS: Add target property to explicitly control solution deployment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4357
| * | | | | | | | | | | VS: Add target property to explicitly control solution deploymentAlexander Boczar2020-02-258-18/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_SOLUTION_DEPLOY` property to control solution deploy mark. Fixes: #20346
* | | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'backport-ctest-resource-allocation-doc' into release-3.17Brad King2020-02-261-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bff839706 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4401
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'backport-ctest-resource-allocation-doc'Brad King2020-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bff839706 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4401
| * | | | | | | | | | | | Help: Clarify that the CTest resource allocation feature doesn't oversubscribeKyle Edwards2020-02-261-0/+9
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge topic 'CPackRPM-trans-scripts'Brad King2020-02-265-17/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0534c4a68 CPackRPM: Add PRE_/POST_TRANS scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4387
| * | | | | | | | | | | | CPackRPM: Add PRE_/POST_TRANS scriptsSarang Joshi2020-02-245-17/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add variables for PRE_TRANS and POST_TRANS scripts. Fixes: #18917
* | | | | | | | | | | | | Merge topic 'bzip2-warnings'Brad King2020-02-261-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db1447b2cf bzip2: Disable MSVC warnings in 3rd party code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4395
| * | | | | | | | | | | | | bzip2: Disable MSVC warnings in 3rd party codeBrad King2020-02-251-1/+3
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 35acaa90c5 (bzip2: Add compilation flags to disable warnings in third-party code, 2020-02-24) we forgot to disable warnings for MSVC.
* | | | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge topic 'cmake-cfg-intdir-ninja-multi' into release-3.17Brad King2020-02-261-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 853c3eac6d Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4397
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'cmake-cfg-intdir-ninja-multi'Brad King2020-02-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 853c3eac6d Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4397
| * | | | | | | | | | | | | Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-ConfigKyle Edwards2020-02-251-0/+7
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge topic 'RunCMake-test-lang' into release-3.17Brad King2020-02-261-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4389
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'RunCMake-test-lang'Brad King2020-02-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4389
| * | | | | | | | | | | | | | Tests: fix RunCMake.Make test when run on systems with non-english localeRolf Eike Beer2020-02-261-0/+3
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `LANG=C` in the environment so the output of `make` is predictable. Fixes: #19689