summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-xml-improve'Brad King2019-12-171-12/+6
|\ | | | | | | | | | | | | d8f1736dcc cmVisualStudio10TargetGenerator: improve XML element generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4140
| * cmVisualStudio10TargetGenerator: improve XML element generationVitaly Stakhovsky2019-12-151-12/+6
| | | | | | | | When an element is emitted, the newline will be printed first, not last
* | Merge topic 'stdstring-target'Brad King2019-12-1719-52/+51
|\ \ | | | | | | | | | | | | | | | | | | c34b4497f8 cmTarget: add std::string overloads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4137
| * | cmTarget: add std::string overloadsVitaly Stakhovsky2019-12-1419-52/+51
| |/
* | Merge topic 'FindProtobuf-no-protoc'Brad King2019-12-171-12/+14
|\ \ | | | | | | | | | | | | | | | | | | db0b740fd8 FindProtobuf: Do not verify protoc version if it is not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4121
| * | FindProtobuf: Do not verify protoc version if it is not foundDiego Pino Garcia2019-12-161-12/+14
| |/
* | Merge topic 'fat-ios'Brad King2019-12-173-27/+131
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b41195d2 Handle multi-arch sysroots on Apple platforms 372c89ea38 Refactor -arch and -isysroot code usage 7a44e16d7f Refactor SDK name to path into a function 777d364913 Use xcrun instead of xcodebuild for resolving SDK path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4125
| * | Handle multi-arch sysroots on Apple platformsTor Arne Vestbø2019-12-133-7/+106
| | |
| * | Refactor -arch and -isysroot code usageCristian Adam2019-12-111-13/+14
| | |
| * | Refactor SDK name to path into a functionCristian Adam2019-12-111-11/+15
| | |
| * | Use xcrun instead of xcodebuild for resolving SDK pathTor Arne Vestbø2019-12-091-1/+1
| | | | | | | | | | | | It's much cheaper to run.
* | | CMake Nightly Date StampKitware Robot2019-12-171-1/+1
| | |
* | | Merge branch 'release-3.15'Brad King2019-12-160-0/+0
|\ \ \
| * | | CMake 3.15.6v3.15.6Brad King2019-12-161-1/+1
| | | |
* | | | Merge topic 'ninja-multi'Brad King2019-12-16143-910/+3678
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c062f9d99 Help: Add documentation and release notes for multi-config Ninja e0478cc646 Tests: Add test for Multi-Configuration Ninja generator 5a8a9f7229 Ninja: Add multi-config variant 3bc63e99e4 Refactor: Prepare Ninja generator for multi-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4086
| * | | | Help: Add documentation and release notes for multi-config NinjaKyle Edwards2019-12-136-3/+98
| | | | |
| * | | | Tests: Add test for Multi-Configuration Ninja generatorKyle Edwards2019-12-1373-6/+1717
| | | | |
| * | | | Ninja: Add multi-config variantKyle Edwards2019-12-1354-416/+1264
| | | | | | | | | | | | | | | | | | | | Co-Authored-by: vector-of-bool <vectorofbool@gmail.com>
| * | | | Refactor: Prepare Ninja generator for multi-configKyle Edwards2019-12-1323-527/+641
| | | | |
* | | | | Merge topic 'bootstrap-intel'Brad King2019-12-161-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 033a4b12a5 bootstrap: Extend C++17 check for our cast functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4139
| * | | | | bootstrap: Extend C++17 check for our cast functionsBrad King2019-12-141-1/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fc3b4caa2e (Memory management: cast functions for managed pointers, 2019-11-18) we added a check to `Source/Checks/cm_cxx17_check.cpp` to avoid using C++17 mode on a compiler that does not support all our C++17 usage. Add the check to our bootstrap script too.
* | | | | Merge topic 'test-vtk'Brad King2019-12-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59e2e72159 Tests/Contracts: Update VTK repository URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4138
| * | | | | Tests/Contracts: Update VTK repository URLBrad King2019-12-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | The vtk.org/vtk.git repository has long been superseded by the repository on gitlab.kitware.com. The former is no longer available.
* | | | | Merge branch 'release-3.16'Brad King2019-12-160-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'pch-force-include' into release-3.16Brad King2019-12-162-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5c218fa0d PCH: Append pch header file to list of forced include files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4135
* | \ \ \ \ \ Merge topic 'pch-force-include'Brad King2019-12-162-1/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5c218fa0d PCH: Append pch header file to list of forced include files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4135
| * | | | | | PCH: Append pch header file to list of forced include filesCristian Adam2019-12-132-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20088
* | | | | | | CMake Nightly Date StampKitware Robot2019-12-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-12-151-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-12-141-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release-3.15'Brad King2019-12-130-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15Brad King2019-12-121-2/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4134
| * \ \ \ \ Merge branch 'backport-3.15-vs-v142-version' into release-3.15Brad King2019-12-122-12/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4133
* | \ \ \ \ \ Merge branch 'release-3.16'Brad King2019-12-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'FindBLAS-OpenBLAS-thread' into release-3.16Brad King2019-12-131-2/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4134
* | | | | | | Merge topic 'FindBLAS-OpenBLAS-thread'Brad King2019-12-131-2/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4134
| * | | | | | FindBLAS: Consider OpenBLAS with thread libraries only with C or CXXBrad King2019-12-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added by commit 276b56f01c (FindBLAS: Add second try for OpenBLAS with thread libraries., 2019-06-07, v3.15.0-rc2~5^2) can work only when C or CXX is enabled. Fixes: #20092
* | | | | | | Merge branch 'release-3.16'Brad King2019-12-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'backport-3.16-vs-v142-version' into release-3.16Brad King2019-12-132-12/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+ 07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4133
* | \ \ \ \ \ \ Merge topic 'backport-3.16-vs-v142-version'Brad King2019-12-132-12/+18
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+ 07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4133
| * | | | | | | Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-versionBrad King2019-12-120-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-122-12/+15
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.15.5~6^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
| * | | | | | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-122-12/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.16.0-rc1~32^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
* | | | | | CMake Nightly Date StampKitware Robot2019-12-131-1/+1
| | | | | |
* | | | | | Merge topic 'function-var-current'Kyle Edwards2019-12-1219-41/+253
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR 90e3e2a777 cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variables dd54290dab Refactor: Modernize `function` command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4000
| * | | | | | Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIRAlex Turbov2019-12-105-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modules define an intermediate global scope visible variables to access "resource" files from functions. Now these variables could be eliminated.
| * | | | | | cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variablesAlex Turbov2019-12-1014-0/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMAKE_CURRENT_FUNCTION` Can be used for diagnostic or debugging messages like the `__PRETTY_FUNCTION__` macro of GCC. `CMAKE_CURRENT_FUNCTION_LIST_DIR` Eliminates the necessity of the additional "global" variables inside a module used to access additional "resource" files from functions defined in the module. ...
| * | | | | | Refactor: Modernize `function` commandAlex Turbov2019-12-071-27/+30
| | | | | | |
* | | | | | | Merge topic 'link-options-propagation'Brad King2019-12-122-5/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af9d4f24ae Link properties: must be transitive over private dependency on static library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4130
| * | | | | | | Link properties: must be transitive over private dependency on static libraryMarc Chevrier2019-12-122-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure transitivity over multiple static libraries. Fixes: bbba701899 (Link properties: must be transitive over private dependency on static library, 2019-12-06)