summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reduce the scope of temporary cmProp variables and other improvementsVitaly Stakhovsky2020-11-0512-49/+39
|
* Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-ASM'Brad King2020-11-051-1/+1
|\ | | | | | | | | | | | | 52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5464
| * Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASMMaxime Girard2020-11-041-1/+1
| | | | | | | | | | | | Generate build command for assembly file in `compile_command.json`. Issue: #20059
* | Merge topic 'GNUInstallDirs-dir'Brad King2020-11-054-6/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | a61007b3b0 Tests: Add RunCMake.GNUInstallDirs case for get_absolute_install_dir 229b5ee994 GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5450
| * | Tests: Add RunCMake.GNUInstallDirs case for get_absolute_install_dirBrad King2020-11-043-0/+24
| | |
| * | GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dirRoger Leigh2020-11-041-6/+23
| | | | | | | | | | | | Fixes: #21152
* | | Merge topic 'android-stl'Brad King2020-11-054-0/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4dca078829 Android: Link c++abi and android_support when necessary 738caa4d48 Android: Add options to control exceptions/rtti Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5444
| * | | Android: Link c++abi and android_support when necessaryHaibo Huang2020-11-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For older NDKs we used `__android_stl_lib` to link these libraries, but the `CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED` code path does not use that. Link the libraries the way the NDK toolchain file does: https://android.googlesource.com/platform/ndk/+/43b2de34ef9e3a70573fe51a9e069f985a4be5b9/build/cmake/android.toolchain.cmake#368
| * | | Android: Add options to control exceptions/rttiHaibo Huang2020-11-044-0/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | With the NDK's `android.toolchain.cmake`, the user can control whether exceptions/rtti is enabled using `ANDROID_CPP_FEATURES`: https://android.googlesource.com/platform/ndk/+/43b2de34ef9e3a70573fe51a9e069f985a4be5b9/build/cmake/android.toolchain.cmake#548 Add `CMAKE_ANDROID_RTTI` and `CMAKE_ANDROID_EXCEPTIONS` to support that.
* | | Merge topic 'cmprop-source'Brad King2020-11-055-15/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c7b50349de cmSourceFile::GetPropertyForUser: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5462
| * | | cmSourceFile::GetPropertyForUser: return cmPropVitaly Stakhovsky2020-11-045-15/+17
| |/ / | | | | | | | | | also fix GetSafeProperty() return type
* | | Merge topic 'abi-byte-order'Craig Scott2020-11-0523-3/+113
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f511a1c009 CMakeDetermineCompilerABI: Detect byte order as part of check 606b34b3a6 CMakeDetermineCompilerABI: Look for more INFO strings in test binary Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Juan Ramos <juan.ramos@amd.com> Acked-by: John Palmer <juanr0911@gmail.com> Merge-request: !5460
| * | | CMakeDetermineCompilerABI: Detect byte order as part of checkBrad King2020-11-0423-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already detect `sizeof(void*)`. Detect the byte order as part of the same check. Issue: #21392
| * | | CMakeDetermineCompilerABI: Look for more INFO strings in test binaryBrad King2020-11-041-3/+5
| |/ / | | | | | | | | | | | | Explicitly use only the first occurrence of each matched INFO string since previously we only extracted the first two anyway.
* | | CMake Nightly Date StampKitware Robot2020-11-051-1/+1
| | |
* | | Merge branch 'release-3.19'Brad King2020-11-040-0/+0
|\ \ \
| * \ \ Merge topic 'cmake_path-deactivation' into release-3.19Brad King2020-11-0412-866/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c912056a1 cmake_path: remove new command from 3.19 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5459
* | \ \ \ Merge topic 'cmake_path-deactivation'Brad King2020-11-042-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1583d50feb Help: Move cmake_path release note from 3.19 to post-3.19 development cd1c5a89a2 Merge branch 'backport-3.19-cmake_path-deactivation' 1c912056a1 cmake_path: remove new command from 3.19 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5459
| * | | | | Help: Move cmake_path release note from 3.19 to post-3.19 developmentBrad King2020-11-042-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature has been removed from the 3.19 branch, but has been kept in post-3.19 development. Move the release note accordingly.
| * | | | | Merge branch 'backport-3.19-cmake_path-deactivation'Brad King2020-11-040-0/+0
| |\ \ \ \ \ |/ / / / / / | | | _ / / | | | / / | | | | | The branch removes the `cmake_path` command from CMake 3.19, but we want to keep it in post-3.19 development. Merge using `-s ours`.
| * | | | cmake_path: remove new command from 3.19Marc Chevrier2020-11-0312-866/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Defer adding this command until post-3.19 development so that it has more time to mature before being included in a release. Issue: #21385
* | | | Merge topic 'FindPython-UNVERSIONED_NAMES'Brad King2020-11-047-2/+150
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e452f6e2cf FindPython: Adds control over artifact names to search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5448
| * | | | FindPython: Adds control over artifact names to searchMarc Chevrier2020-11-037-2/+150
| | |/ / | |/| | | | | | | | | | Fixes: #21371
* | | | CMake Nightly Date StampKitware Robot2020-11-041-1/+1
|/ / /
* | | Merge topic '19128_ICU_case_consistency'Brad King2020-11-031-7/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ec23338187 FindICU: Improve case consistency in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5452
| * | | FindICU: Improve case consistency in documentationRoger Leigh2020-10-311-7/+5
| | | |
* | | | Merge topic 'cmprop-grl'Brad King2020-11-038-31/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5456
| * | | | cmLocalGenerator::GetRuleLauncher: return cmPropvvs314152020-11-028-31/+29
| | | | |
* | | | | Merge topic 'nmc-test-fix'Brad King2020-11-032-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0a7c0d40d Tests: Fix one RunCMake.NinjaMultiConfig case name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5447
| * | | | | Tests: Fix one RunCMake.NinjaMultiConfig case nameBrad King2020-11-022-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CustomCommandGenerator `debug-in-release-graph-clean` case actually cleans using the Debug graph. This is intentional in order to test cleaning only the Debug parts, so fix the test name rather than changing what graph it uses.
* | | | | | Merge topic 'android-hooks'Brad King2020-11-035-0/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 707a06761f Android: add NDK hooks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5436
| * | | | | | Android: add NDK hooksHaibo Huang2020-10-305-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds hooks to key Android support files, so that NDK can inject information or change cmake behaviors.
* | | | | | | Merge branch 'release-3.19'Brad King2020-11-030-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'cmake-presets-no-path-arg-warning' into release-3.19Brad King2020-11-034-1/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb2d01c182 CMakePresets.json: Don't warn if no path argument is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5455
* | \ \ \ \ \ \ Merge topic 'cmake-presets-no-path-arg-warning'Brad King2020-11-034-1/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb2d01c182 CMakePresets.json: Don't warn if no path argument is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5455
| * | | | | | | CMakePresets.json: Don't warn if no path argument is givenKyle Edwards2020-11-024-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If --preset is specified with no path argument, use the current directory as the source directory, the preset's binaryDir as the binary directory, and don't issue the standard warning for no path specified. Fixes: #21386
* | | | | | | | Merge branch 'release-3.19'Brad King2020-11-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'fix-cuda-qnx' into release-3.19Brad King2020-11-034-3/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0832516bec Help: Add 3.19 release note about CUDA support on QNX bcdd486bf7 CUDA: Enable support on QNX Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5446
* | \ \ \ \ \ \ \ Merge topic 'fix-cuda-qnx'Brad King2020-11-034-3/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0832516bec Help: Add 3.19 release note about CUDA support on QNX bcdd486bf7 CUDA: Enable support on QNX Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5446
| * | | | | | | | Help: Add 3.19 release note about CUDA support on QNXBrad King2020-11-021-0/+2
| | | | | | | | |
| * | | | | | | | CUDA: Enable support on QNXjanbernloehr2020-11-023-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following two issues with the CUDA support on QNX: * cuda target name is not derived correctly (should be `aarch64-qnx`). * linking `cudart` must not be linked against `rt`, `dl`, `pthread`. This enables to use cmake's native cuda support on QNX. Fixes: #21381
* | | | | | | | | Merge branch 'release-3.19'Craig Scott2020-11-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'doc-cpack-pre-post-scripts' into release-3.19Craig Scott2020-11-031-16/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b77dfa441f Help: Clarify variables specifying scripts to execute during packaging Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !5454
* | \ \ \ \ \ \ \ \ Merge topic 'doc-cpack-pre-post-scripts'Craig Scott2020-11-031-16/+28
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b77dfa441f Help: Clarify variables specifying scripts to execute during packaging Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !5454
| * | | | | | | | | Help: Clarify variables specifying scripts to execute during packagingCraig Scott2020-11-031-16/+28
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | Relates: #19077
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-11-031-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.19'Brad King2020-11-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-11-021-2/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5445
* | | | | | | | Merge topic 'FindBoost-config-mode'Brad King2020-11-021-2/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5445
| * | | | | | | FindBoost: Avoid leaking internal Boost_ROOT settingBrad King2020-10-301-2/+8
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4b2a61946f (FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig, 2020-10-22, v3.19.0-rc2~14^2) we accidentally leak our internal setting of `Boost_ROOT`. Revise the logic to unset our temporary value. Fixes: #21379
generated by cgit v0.12 at 2025-09-18 11:30:02 (GMT)