summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor: Prepare Ninja generator for multi-configKyle Edwards2019-12-1323-527/+641
|
* 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)
* | | | | | Merge topic 'add_cuda_meta_compiler_features'Brad King2019-12-1250-71/+652
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2467a2b318 CUDA: Add cuda meta-features (e.g. ``cuda_std_11``) support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3992
| * | | | | | CUDA: Add cuda meta-features (e.g. ``cuda_std_11``) supportRobert Maynard2019-12-1050-71/+652
| | | | | | |
* | | | | | | Merge topic 'FindThreads-tsan'Brad King2019-12-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b328cbaadb FindThreads: Add pthread_cancel to program to test for pthreads in libc Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !4056
| * | | | | | | FindThreads: Add pthread_cancel to program to test for pthreads in libcCristian Morales Vega2019-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using ThreadSanitizer our existing CMAKE_HAVE_LIBC_PTHREAD test program links using symbols from the tsan library. Among the symbols not provided by that library, `pthread_cancel()` seems to be the less risky symbol to add to the check. Fixes: #19981
* | | | | | | | Merge topic 'ctest-drmemory-support'Brad King2019-12-127-8/+203
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 676befdf52 ctest: add support for memcheck using Dr. Memory 2db0a65f56 cmCTestMemCheckHandler.cxx: minor refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4119
| * | | | | | | | ctest: add support for memcheck using Dr. MemoryDietmar Scheidl2019-12-107-2/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19788
| * | | | | | | | cmCTestMemCheckHandler.cxx: minor refactoringDietmar Scheidl2019-12-101-6/+3
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-12-121-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'ctest-configuration-type'Kyle Edwards2019-12-117-0/+45
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6f758be6d ctest: Populate CTEST_CONFIGURATION_TYPE from the -C command line when set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4109
| * | | | | | | | | ctest: Populate CTEST_CONFIGURATION_TYPE from the -C command line when setJulien Jomier2019-12-097-0/+45
| |/ / / / / / / /
* | | | | | | | | Merge topic 'cpack-use-CPACK_PACKAGE_HOMEPAGE_URL'Kyle Edwards2019-12-118-5/+58
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3476dbe6d7 CPack: CMAKE_PROJECT_HOMEPAGE_URL -> CPACK_PACKAGE_HOMEPAGE_URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4024
| * | | | | | | | | CPack: CMAKE_PROJECT_HOMEPAGE_URL -> CPACK_PACKAGE_HOMEPAGE_URLAlex Turbov2019-12-098-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At CPack running time the `CMAKE_PROJECT_HOMEPAGE_URL` variable is not set. Internal CPack modules (e.g. CPackDEB, CPackRPM, CPackFreeBSD) should use `CPACK_PACKAGE_HOMEPAGE_URL` instead, which is available after inclusion of `CPack.cmake` into `CMakeLists.txt`. Closes: #19607
* | | | | | | | | | Merge topic 'msvc-arm64-windows10'Brad King2019-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea882b4aa9 MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4129
| * | | | | | | | | | MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop)shibayan2019-12-101-1/+1
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the same import library as x86/x64 by default for Windows 10 ARM64 (Desktop, not UWP). Fixes: #20077
* | | | | | | | | | Merge topic 'modernize-memory-management'Brad King2019-12-1132-304/+331
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36c8cae2e8 cmLocalGenerator: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4124
| * | | | | | | | | cmLocalGenerator: modernize memory managementMarc Chevrier2019-12-0932-304/+331
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2019-12-111-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-12-100-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | CMake 3.16.1v3.16.1Brad King2019-12-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-12-100-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge topic 'wxwidgets_macos_weakframework' into release-3.16Brad King2019-12-101-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
* | \ \ \ \ \ \ \ \ Merge topic 'wxwidgets_macos_weakframework'Brad King2019-12-101-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
| * | | | | | | | | FindwxWidgets: Add support for 3.1.3 on macOSTobias Taschner2019-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only -framework was used starting with 3.1.3 -weak_framework might also be used and has to be handled.
* | | | | | | | | | Merge branch 'release-3.15'Brad King2019-12-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'backport-3.15-toc_on_ppc' into release-3.15Brad King2019-12-092-2/+35
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4122
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.16'Brad King2019-12-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'toc_on_ppc' into release-3.16Brad King2019-12-104-4/+42
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc b35926e260 Check for support before adding bigtoc linker flag 958f858ad8 Check for support before adding bigtoc linker flag 8c7b7df788 bootstrap: Add target_link_options command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4122
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'toc_on_ppc'Brad King2019-12-106-40/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb984c6627 Check*CompilerFlag: Modernize modules d806263578 Merge branch 'backport-3.16-toc_on_ppc' into toc_on_ppc 90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc b35926e260 Check for support before adding bigtoc linker flag 958f858ad8 Check for support before adding bigtoc linker flag 8c7b7df788 bootstrap: Add target_link_options command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4122
| * | | | | | | | | | | | Check*CompilerFlag: Modernize modulesAlexander Grund2019-12-092-36/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - User lower-case names - Wrap in function instead of macro to avoid set-unset calls - Use IN LISTS for foreach