summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.16'Brad King2019-12-190-0/+0
|\
| * CMake 3.16.2v3.16.2Brad King2019-12-191-1/+1
| |
* | Merge branch 'release-3.16'Brad King2019-12-190-0/+0
|\ \ | |/
| * Merge topic 'autogen-no-hh' into release-3.16Brad King2019-12-194-18/+4
| |\ | | | | | | | | | | | | | | | | | | 7fa7f55230 Autogen: Revert processing of .hh files for compatibility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4146
* | \ Merge topic 'autogen-no-hh'Brad King2019-12-194-18/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 7fa7f55230 Autogen: Revert processing of .hh files for compatibility Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4146
| * | Autogen: Revert processing of .hh files for compatibilityBrad King2019-12-184-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4a9154537c (Autogen: Use cmake::IsHeader/SourceExtension for file type detection, 2019-07-02, v3.16.0-rc1~470^2~4) we process `.hh` files with `AUTOMOC`. However, this change can break existing projects that do not expect the behavior. Revert it for now. It can be restored later via a policy. Fixes: #20101
* | | Merge branch 'release-3.16'Brad King2019-12-190-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'test-resource-spec-init-lists' into release-3.16Brad King2019-12-192-37/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Dickens <michael.dickens@ettus.com> Merge-request: !4141
* | \ \ Merge topic 'test-resource-spec-init-lists'Brad King2019-12-192-37/+37
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Dickens <michael.dickens@ettus.com> Merge-request: !4141
| * | | Tests: Fix testCTestResourceSpec struct initialization for some compilersMichael Dickens2019-12-182-37/+37
| | |/ | |/| | | | | | | | | | | | | | | | | | | Some compilers do not like the nested `{{{}}}` member initialization syntax, so use just `{}`. GCC 4.8 warns about the latter, so add a suppression. Fixes: #20097
* | | CMake Nightly Date StampKitware Robot2019-12-191-1/+1
| | |
* | | Merge topic 'copyright-year'Brad King2019-12-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1edc4a8a7e Copyright.txt: Update year range to end in 2020 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4147
| * | | Copyright.txt: Update year range to end in 2020Brad King2019-12-181-1/+1
|/ / /
* | | Merge branch 'release-3.16'Brad King2019-12-180-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'FindLAPACK-in-blas' into release-3.16Brad King2019-12-181-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4144
* | \ \ Merge topic 'FindLAPACK-in-blas'Brad King2019-12-181-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4144
| * | | FindLAPACK: Fix support for LAPACK symbols inside BLAS librariesBrad King2019-12-181-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Fix the condition added by commit 68dcbeee01 (FindLAPACK: Test for implicitly linked LAPACK libraries, 2019-06-11, v3.16.0-rc1~560^2) to use BLAS libraries if they are sufficient with no dedicated LAPACK libraries. Fixes: #20099
* | | Merge branch 'release-3.16'Brad King2019-12-180-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'FindBoost-1.72' into release-3.16Brad King2019-12-181-3/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | e51232b739 FindBoost: Add support for Boost 1.72 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4143
* | \ \ Merge topic 'FindBoost-1.72'Brad King2019-12-181-3/+17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | e51232b739 FindBoost: Add support for Boost 1.72 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4143
| * | | FindBoost: Add support for Boost 1.72Brad King2019-12-171-3/+17
| | |/ | |/| | | | | | | | | | | | | | | | Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.72.0 sources to compute dependencies. Fixes: #20100
* | | Merge topic 'add-header-cmext-algorithm'Brad King2019-12-1865-208/+461
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7d12609f0 Refactoring: use append functions from cmext/algorithm a38d04c076 Refactoring: introduce header cmext/algorithm with append functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4131
| * | | Refactoring: use append functions from cmext/algorithmMarc Chevrier2019-12-1760-208/+235
| | | |
| * | | Refactoring: introduce header cmext/algorithm with append functionsMarc Chevrier2019-12-175-0/+226
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-12-181-1/+1
| | | |
* | | | Merge topic 'FindCUDAToolkit-module'Brad King2019-12-1714-7/+916
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d484a3c4d8 FindCUDAToolkit: correct searches for Toolkit components e2a5d8374f FindCUDAToolkit: Improve usage, library set, and tests 29560bf07b FindCUDAToolkit: Import targets for toolkit libraries 2c0ff263b4 FindCUDAToolkit: Add module to find the CUDA Toolkit 12d324e55d CUDA: Persist SIZEOF_VOID_P and PLATFORM_ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: Brad King <brad.king@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !4093
| * | | | FindCUDAToolkit: correct searches for Toolkit componentsRobert Maynard2019-12-163-57/+63
| | | | |
| * | | | FindCUDAToolkit: Improve usage, library set, and testsRobert Maynard2019-12-1610-73/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refined the initial design of FindCUDAToolkit and improve it by adding more library support, more toolkit information and tests.
| * | | | FindCUDAToolkit: Import targets for toolkit librariesStephen McDowell2019-12-161-44/+345
| | | | |
| * | | | FindCUDAToolkit: Add module to find the CUDA ToolkitStephen McDowell2019-12-164-0/+380
| | | | |
| * | | | CUDA: Persist SIZEOF_VOID_P and PLATFORM_ABIRobert Maynard2019-12-161-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA language failed to persist CMAKE_SIZEOF_VOID_P and CMAKE_INTERNAL_PLATFORM_ABI, causing find_ calls to fail when the only enabled language was CUDA. This specifically occurred when having to locate libraries inside `lib64` directories.
* | | | | Merge topic 'better_category_for_target_debug_property'Brad King2019-12-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b23c778034 CMAKE_DEBUG_TARGET_PROPERTIES to `provides information` section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4142
| * | | | | CMAKE_DEBUG_TARGET_PROPERTIES to `provides information` sectionRobert Maynard2019-12-161-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This variable only provides debug information and doesn't modify the output of CMake, so move it to the correct variable section.
* | | | | Merge topic 'fix-vs-winrt-by-default'Brad King2019-12-175-7/+102
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557ea4614e VS: Change CMAKE_VS_WINRT_BY_DEFAULT to not implicitly enable WinRT 7bcef355bf Vs: Add test for VS_WINRT_BY_DEFAULT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4127
| * | | | | VS: Change CMAKE_VS_WINRT_BY_DEFAULT to not implicitly enable WinRTPetr Polezhaev2019-12-163-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original behaviour would unconditionally enable WinRT for all projects so source file flag generation code can acknowledge WinRT being present and disable it for C language source files. An unintentional result of that approach is that WinRT is enabled for ALL projects, including C++ projects/source files with no way to disable it Instead use `CMAKE_VS_WINRT_BY_DEFAULT` as a hint that the platform is WinRT-by-default and set global `CompileAsWinRT` flag to `false` unless it was explicitly requested by either `WINRT_COMPONENT` option or `/ZW` compilation option - similar to what Windows Phone/Windows Store platform logic does In case WinRT compilation is enabled for a project by either of aforementioned methods, C language source file override logic will still kick in and disable CompileAsWinRT for C source files Fixes: #20063
| * | | | | Vs: Add test for VS_WINRT_BY_DEFAULTPetr Polezhaev2019-12-163-0/+86
| | | | | |
* | | | | | 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
| | | | | | |