summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.15'Craig Scott2019-07-030-0/+0
|\
| * Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' into release-3.15Craig Scott2019-07-031-0/+8
| |\ | | | | | | | | | Merge-request: !3495
* | \ Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR'Craig Scott2019-07-031-0/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 16434fe303 Help: Discourage using CMAKE_SOURCE_DIR in toolchain files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3495
| * | Help: Discourage using CMAKE_SOURCE_DIR in toolchain filesOleg Chernovskiy2019-07-021-0/+8
| |/ | | | | | | Fixes: #19390
* | CMake Nightly Date StampKitware Robot2019-07-031-1/+1
| |
* | Merge topic 'static'Brad King2019-07-021-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 8aa0b63bc6 Swift: add rules for static linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3492
| * | Swift: add rules for static linkingSaleem Abdulrasool2019-06-281-0/+6
| | | | | | | | | | | | | | | | | | The Swift driver recently learnt how to generate static libraries using the `-static` flag. This enables us to generate proper static libraries with dependency tracking with Swift as well.
* | | Merge topic 'cross_ref_CUDAHOSTCXX_in_CMAKE_CUDA_HOST_COMPILER'Brad King2019-07-021-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d3ebef4f70 CMAKE_CUDA_HOST_COMPILER: Document it takes priority over CUDAHOSTCXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3490
| * | | CMAKE_CUDA_HOST_COMPILER: Document it takes priority over CUDAHOSTCXXRobert Maynard2019-06-271-1/+2
| |/ /
* | | Merge topic 'deprecate-policy-old'Brad King2019-07-023-1/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cf821ff3c4 Add deprecation warnings for policies CMP0067 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3502
| * | | Add deprecation warnings for policies CMP0067 and belowBrad King2019-07-013-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.8 and below to encourage projects to port away from setting policies to OLD.
* | | | Merge topic 'double-export-error-message'Brad King2019-07-029-25/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27d6e51ae9 Tests: add tests for export set error messages 49cfd39007 cmExportBuildFileGenerator: improve error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3486
| * | | | Tests: add tests for export set error messagesBen Boeckel2019-06-277-0/+34
| | | | |
| * | | | cmExportBuildFileGenerator: improve error messageBen Boeckel2019-06-272-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an exported target depends on another exported target that is included in multiple build export sets, the error message was woefully unhelpful. Now, include information about what build exports the dependent target was included in with instructions for fixing the problem that are actually helpful.
* | | | | Merge branch 'release-3.15'Brad King2019-07-020-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'qt-5.13' into release-3.15Brad King2019-07-012-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3500
| * \ \ \ \ Merge branch 'update-expat' into release-3.15Brad King2019-07-0124-1570/+2056
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3501
| * \ \ \ \ \ Merge branch 'cuda-no-device-link-when-disabled' into release-3.15Brad King2019-07-018-11/+38
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3491
* | \ \ \ \ \ \ Merge topic 'qt-5.13'Brad King2019-07-022-5/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 963ddafeaa QtDialog: Use QPalette::WindowText instead of QPalette::Foreground 1a2d6bdefc Tests: Autogen: Use valid rcc compression levels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3500
| * | | | | | | QtDialog: Use QPalette::WindowText instead of QPalette::ForegroundSebastian Holtermann2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `QPalette::Foreground` is deprecated and was replaced by `QPalette::WindowText` since at least Qt 4.8. https://doc.qt.io/archives/qt-4.8/qpalette.html#ColorRole-enum This replaces the `QPalette::Foreground` color role with `QPalette::WindowText` in `QtDialog/RegexExplorer.cxx` to avoid compiler warnings.
| * | | | | | | Tests: Autogen: Use valid rcc compression levelsSebastian Holtermann2019-07-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the invalid compression level 0 when invoking rcc. It let's rcc fail with an error since Qt 5.13.
* | | | | | | | Merge topic 'update-expat'Brad King2019-07-0224-1570/+2056
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0998f6396a Merge branch 'upstream-expat' into update-expat ba13dc2aa8 expat 2019-06-19 (d3b78b42) 7449c63f3e expat: Update script to get Expat 2.2.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3501
| * | | | | | | Merge branch 'upstream-expat' into update-expatBrad King2019-07-0123-1569/+2055
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2019-06-19 (d3b78b42)
| | * | | | | | | expat 2019-06-19 (d3b78b42)Expat Upstream2019-07-0123-1569/+2055
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit d3b78b42a2dcdea98e22625cfff67a49d47e6025 (R_2_2_7).
| * | | | | | | | expat: Update script to get Expat 2.2.7Brad King2019-07-011-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'cuda-no-device-link-when-disabled'Brad King2019-07-028-11/+38
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3491
| * | | | | | | CUDA: Do not device link if CUDA is not an enabled languageRobert Maynard2019-07-018-11/+38
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks added in commit 81b4d10d8f (CUDA: More exhaustive checks to determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2) assumed that CUDA properties would be set only if CUDA is enabled. We cannot do a device link step if we do not have the CUDA language enabled. This was discovered as some projects unconditionally set CUDA properties such as `CUDA_RESOLVE_DEVICE_SYMBOLS` even when the CUDA language has not been enabled. Fixes: #19432
* | | | | | | Merge topic 'FindMPI-AddSuffixes'Marc Chevrier2019-07-021-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5affe415a3 FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3496
| * | | | | | | FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in listsBrian Carlson2019-06-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the `${MPI_EXECUTABLE_SUFFIX}` to each of the items in the `_MPI_${id}_${LANG}_COMPILER_NAMES` and `_MPI_${LANG}_GENERIC_COMPILER_NAMES` rather than just adding the suffix to the last item in each list.
* | | | | | | | CMake Nightly Date StampKitware Robot2019-07-021-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'remove_unneeded_variables_from_cmFindPackageCommand'Brad King2019-07-011-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96b10e47be Remove unused variables from cmFindPackageCommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3488
| * | | | | | | Remove unused variables from cmFindPackageCommandRobert Maynard2019-06-261-6/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'override-rules-RC'Brad King2019-07-011-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2f20ab217 RC: Honor CMAKE_USER_MAKE_RULES_OVERRIDE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3489
| * | | | | | | RC: Honor CMAKE_USER_MAKE_RULES_OVERRIDEBrad King2019-06-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the refactoring in commit 48f7e2d300 (Unhardcode the CMAKE_CONFIGURATION_TYPES values, 2017-11-27, v3.11.0-rc1~130^2~1), `CMAKE_BUILD_TYPE` is initialized while enabling the RC language. Therefore we need to honor `CMAKE_USER_MAKE_RULES_OVERRIDE` as part of enabling RC so that a `CMAKE_BUILD_TYPE_INIT` setting in the override file is honored. Fixes: #19401
* | | | | | | | Merge topic 'FindMatlab-EXCLUDE_FROM_ALL'Brad King2019-07-013-1/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11e0009b77 FindMatlab: EXCLUDE_FROM_ALL parameter to matlab_add_mex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3474
| * | | | | | | | FindMatlab: EXCLUDE_FROM_ALL parameter to matlab_add_mexRaffi Enficiaud2019-06-263-1/+38
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Enabling a mex target to be excluded from the `all` target.
* | | | | | | | Merge branch 'release-3.15'Craig Scott2019-07-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'docs-project-code-injection' into release-3.15Craig Scott2019-07-011-13/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3494
* | \ \ \ \ \ \ \ Merge branch 'release-3.15'Craig Scott2019-07-010-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'bug/19436' into release-3.15Craig Scott2019-07-012-1/+14
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Merge-request: !3497
* | | | | | | | | Merge topic 'docs-project-code-injection'Craig Scott2019-07-011-13/+18
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42294f43bd Help: move code injection vars to their own section 9e0775cb6a Help: Remove self-references from project() docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3494
| * | | | | | | | Help: move code injection vars to their own sectionCraig Scott2019-06-301-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for CMAKE_PROJECT_<projName>_INCLUDE and CMAKE_PROJECT_INCLUDE did not define the order of inclusion if both were set.
| * | | | | | | | Help: Remove self-references from project() docsCraig Scott2019-06-291-5/+5
| |/ / / / / / /
* | | | | | | | Merge topic 'bug/19436'Craig Scott2019-07-012-1/+14
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 822abf1265 list(POP_FRONT): Fix always assigning first item to output vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3497
| * | | | | | | list(POP_FRONT): Fix always assigning first item to output varsAlex Turbov2019-06-302-1/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #19436
* | | | | | | CMake Nightly Date StampKitware Robot2019-07-011-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-301-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-06-291-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-06-281-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'vs-dpi-aware'Brad King2019-06-2710-8/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd92f8f8bf VS: Add VS_DPI_AWARE target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3418
generated by cgit v0.12 at 2025-02-04 06:39:01 (GMT)