summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | VS: Add VS_DPI_AWARE target propertyMatt Weir2019-06-2610-8/+120
| | | | | | | | | | | | | | | | | | | | | | | | | Enables setting the visual studio project property for Manifests, controlling the DPI Aware setting.
* | | | | Merge branch 'release-3.15'Brad King2019-06-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | CMake 3.15.0-rc3v3.15.0-rc3Brad King2019-06-271-1/+1
| | | |
* | | | Merge branch 'release-3.15'Brad King2019-06-270-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'cuda-msvc-runtime-library' into release-3.15Brad King2019-06-265-19/+39
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3485
* | \ \ \ Merge topic 'cuda-msvc-runtime-library'Brad King2019-06-275-19/+39
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fbd25772f CUDA: Implement MSVC runtime library abstraction 07807a2006 VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3485
| * | | | CUDA: Implement MSVC runtime library abstractionBrad King2019-06-264-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked updating flags for CUDA on Windows, where nvcc uses MSVC as the host compiler. Add them now and update the MSVCRuntimeLibrary test to cover CUDA. Fixes: #19428
| * | | | VS: Use AddLanguageFlags to de-duplicate CMAKE_{CUDA,ASM*}_FLAGS lookupBrad King2019-06-261-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the refactoring from commit 707283981f (VS: Use AddLanguageFlags to de-duplicate CMAKE_<LANG>_FLAGS* lookup, 2019-04-01, v3.15.0-rc1~300^2) to the CUDA, ASM_MASM, and ASM_NASM languages too. In particular, CUDA needs the MSVC runtime library selection logic in the `AddLanguageFlags` method that is used by other generators.
* | | | | CMake Nightly Date StampKitware Robot2019-06-271-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'build-install-rpath-genex'Brad King2019-06-269-31/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d29ed8a114 BUILD_RPATH/INSTALL_RPATH: Add generator expression support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3481
| * | | | BUILD_RPATH/INSTALL_RPATH: Add generator expression supportKyle Edwards2019-06-259-31/+109
| | | | | | | | | | | | | | | | | | | | Fixes: #19423
* | | | | Merge topic 'implicit-includes-realpath'Brad King2019-06-261-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d88b38d05d Normalize paths when checking for implicit include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3467
| * | | | | Normalize paths when checking for implicit include dirsDaniel Scharrer2019-06-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC replaces implicit include directories with user-supplied ones if they point to the same directory, even if the path strings differ.
* | | | | | Merge topic 'findmpi_use_interface_link_options'Brad King2019-06-261-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39c572c9c9 FindMPI: Updated to use INTERFACE_LINK_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3476
| * | | | | | FindMPI: Updated to use INTERFACE_LINK_OPTIONSRobert Maynard2019-06-241-3/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute'Brad King2019-06-261-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2595a4958 FindMatlab: removing spaces in compiler define Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3473
| * | | | | | FindMatlab: removing spaces in compiler defineRaffi Enficiaud2019-06-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))` are causing a compilation error. Fixes: #19279
* | | | | | | Merge topic 'protobuf-c++11'Brad King2019-06-261-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e28240ea1f FindProtobuf: C++11 support is required since version 3.6.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3470
| * | | | | | | FindProtobuf: C++11 support is required since version 3.6.0Rolf Eike Beer2019-06-251-0/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'find-testlist'Brad King2019-06-261-167/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f68492912c Tests: reduce code duplication for CMake_TEST_Find* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3471
| * | | | | | | Tests: reduce code duplication for CMake_TEST_Find*Rolf Eike Beer2019-06-241-167/+49
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'fix-xcode6-compilation'Brad King2019-06-261-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ff1f75718 Fix Xcode 6.1.1 compilation issue Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3480
| * | | | | | | Fix Xcode 6.1.1 compilation issueRaffi Enficiaud2019-06-251-4/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.15'Brad King2019-06-260-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'doc-CMAKE_FRAMEWORK-crossref' into release-3.15Brad King2019-06-261-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3478
generated by cgit v0.12 at 2025-03-06 20:59:28 (GMT)