summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-trace-nullptr'Brad King2018-04-115-4/+17
|\ | | | | | | | | | | | | 6f2701abf6 CPack: Fix crash on invalid generator name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1950
| * CPack: Fix crash on invalid generator nameBrad King2018-04-105-4/+17
| | | | | | | | | | | | | | | | In commit v3.11.0-rc1~68^2 (CPack: accept --trace and --trace-expand, 2017-12-09) a nullptr dereference was added that occurs when `cpack -G NotAGenerator` is invoked. Add the needed condition. Fixes: #17900
* | Merge topic 'UseSWIG-bugfixes'Craig Scott2018-04-111-7/+11
|\ \ | | | | | | | | | | | | | | | | | | 963837cf17 UseSWIG: fix erroneous generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1947
| * | UseSWIG: fix erroneous generator expressionsMarc Chevrier2018-04-101-7/+11
| | | | | | | | | | | | Add note regarding multi-config generators
* | | CMake Nightly Date StampKitware Robot2018-04-111-1/+1
| | |
* | | Merge branch 'release-3.11'Brad King2018-04-100-0/+0
|\ \ \
| * \ \ Merge branch 'fix-crash-trace-exp-uninit-vars' into release-3.11Brad King2018-04-095-8/+20
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1944
* | \ \ \ Merge topic 'fix-crash-trace-exp-uninit-vars'Brad King2018-04-105-8/+20
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | aad360eb3d Fix crash with --trace-expand --warn-uninitialized together Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1944
| * | | | Fix crash with --trace-expand --warn-uninitialized togetherR2RT2018-04-095-8/+20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Some code paths in `ExpandVariablesInString{New,Old}` were not checking the `filename` parameter for a null pointer, but this can happen when using the above flags together. Add the checks and a test case. Fixes: #17896
* | | | Merge topic 'doc-install-export-android'Brad King2018-04-101-4/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 4a127b78fd Help: Fix install(EXPORT_ANDROID_MK) mode documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1943
| * | | Help: Fix install(EXPORT_ANDROID_MK) mode documentationBrad King2018-04-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `install(EXPORT_ANDROID_MK)` is its own mode, not an option to the normal `install(EXPORT)` mode. While at it, also fix the prose in our documented example to match the code. Fixes: #17891
* | | | CMake Nightly Date StampKitware Robot2018-04-101-1/+1
| | | |
* | | | Merge topic 'test-CompileFeatures-simplify'Brad King2018-04-091-174/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4edf0d68ee Tests: Simplify CompileFeatures expectation logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1939
| * | | | Tests: Simplify CompileFeatures expectation logicBrad King2018-04-061-174/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than repeating compiler version checks for feature availability, generate genex expectations using the detect list of features. We already separately verify that the list of features is correct.
* | | | | Merge topic 'FindCUDA-nvcc-clcache-support'Brad King2018-04-091-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 2da3698447 FindCUDA: Add support for clcache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1933
| * | | | FindCUDA: Add support for clcacheEdward Z. Yang2018-04-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_C_COMPILER` is `clcache`, pass plain `cl` as the host compiler to `nvcc`. Otherwise, `nvcc` does not accept it. Signed-off-by: Edward Z. Yang <ezyang@fb.com>
* | | | | CMake Nightly Date StampKitware Robot2018-04-091-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-04-081-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-04-071-1/+1
| | | | |
* | | | | Merge topic 'UseSWIG-bugfixes'Craig Scott2018-04-069-41/+45
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 38dcdd7641 UseSWIG: Ensure tests are usable in multi-config mode. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1934
| * | | | UseSWIG: Ensure tests are usable in multi-config mode.Marc Chevrier2018-04-059-41/+45
| |/ / / | | | | | | | | | | | | Fixes: #17875
* | | | Merge topic 'ninja-fortran-rspfile'Brad King2018-04-066-69/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6390ce26e Ninja: Fix Fortran support with response files 8592c6326b cmNinjaTargetGenerator: Move force-rspfile check to earlier e0aa060352 cmNinjaTargetGenerator: Move depfile logic to later in its function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1936
| * | | | Ninja: Fix Fortran support with response filesBrad King2018-04-056-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator splits preprocessing and compilation steps for Fortran. Fix this logic to work when using response files for compilation so that it works for the preprocessing step too. This fixes behavior under `CMAKE_NINJA_FORCE_RESPONSE_FILE`. Issue: #17877
| * | | | cmNinjaTargetGenerator: Move force-rspfile check to earlierBrad King2018-04-051-4/+5
| | | | |
| * | | | cmNinjaTargetGenerator: Move depfile logic to later in its functionBrad King2018-04-051-47/+49
| | | | | | | | | | | | | | | | | | | | Clarify that other compile rule generation logic does not depend on it.
* | | | | Merge topic 'minor-cleanups'Brad King2018-04-0615-35/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acda926a04 Replace some uses of sprintf with std::to_string 418541035f cmCTestCurl: Fix UploadFile declared parameter names 1519628e60 cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsigned 2f87d00803 cmMacroCommand: Fix format string to match type of argument b0676cc5d4 Add in-class initialization of some members 966dba5b68 cmAlgorithms: Remove unnecessary typename keyword 12a145534a gitignore: Ignore a .vs directory in the source tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1932
| * | | | | Replace some uses of sprintf with std::to_stringjrp20142018-04-052-19/+18
| | | | | |
| * | | | | cmCTestCurl: Fix UploadFile declared parameter namesjrp20142018-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Match the order used in the definition.
| * | | | | cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsignedjrp20142018-04-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's used in unsigned contexts, such as with format strings.
| * | | | | cmMacroCommand: Fix format string to match type of argumentjrp20142018-04-051-1/+1
| | | | | |
| * | | | | Add in-class initialization of some membersjrp20142018-04-057-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several class constructors leave members uninitialized. The members are initialized before use in methods, but it is clearer and less error-prone to initialize them at their definition site.
| * | | | | cmAlgorithms: Remove unnecessary typename keywordjrp20142018-04-051-1/+1
| | | | | |
| * | | | | gitignore: Ignore a .vs directory in the source treejrp20142018-04-051-0/+3
| | |/ / / | |/| | |
* | | | | Merge topic 'sanitize-LINK_DIRECTORIES'Brad King2018-04-061-6/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ad329f7c0 Sanitize paths from LINK_DIRECTORIES directory property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1920
| * | | | | Sanitize paths from LINK_DIRECTORIES directory propertyjrp20142018-04-041-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally they are sanitized by the `link_directories` command before populating the property, but projects may set the property directly.
* | | | | | Merge topic 'xml-level'Brad King2018-04-062-14/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 050ddfb3f3 cmXMLWriter: code improvement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1925
| * | | | | | cmXMLWriter: code improvementVitaly Stakhovsky2018-04-032-14/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | New Indent member will be used for XML indentation
* | | | | | Merge topic 'glob_configure_depends'Brad King2018-04-0638-56/+793
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c4f8b4596 Adjust help documentation for file(GLOB), add topic notes 20612978c8 Add tests for `file(GLOB)` CONFIGURE_DEPENDS flag 3f4b81f540 Add glob verify support to XCode, VS, Ninja, and Makefile generators ca0befc2e1 Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommand 599c93e22d Add cmGlobVerificationManager class, integrate with cmake and cmState Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1767
| * | | | | | Adjust help documentation for file(GLOB), add topic notesShane Parris2018-04-022-2/+17
| | | | | | |
| * | | | | | Add tests for `file(GLOB)` CONFIGURE_DEPENDS flagShane Parris2018-04-0219-0/+159
| | | | | | |
| * | | | | | Add glob verify support to XCode, VS, Ninja, and Makefile generatorsShane Parris2018-04-029-54/+227
| | | | | | |
| * | | | | | Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommandShane Parris2018-03-291-0/+38
| | | | | | |
| * | | | | | Add cmGlobVerificationManager class, integrate with cmake and cmStateShane Parris2018-03-298-0/+352
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-061-1/+1
| | | | | | |
* | | | | | | Merge topic 'findwxwidgets-msys-library-dirs'Brad King2018-04-051-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1930
| * | | | | | | FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYSARATA Mizuki2018-04-041-0/+20
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for `wxWidgets_LIBRARIES` variable, introduced by e8b77084, fails with the `wx-config` script generated by an MSYS build, because `wxWidgets_LIBRARY_DIRS` is in POSIX style. This commit fixes the problem with `wxWidgets_LIBRARY_DIRS` by converting it to Windows style. The actual code were copied from bf643286, which does the same thing for `wxWidgets_INCLUDE_DIRS`.
* | | | | | | Merge topic 'vs10-groups'Brad King2018-04-052-79/+102
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30bbb4f2ac cmVisualStudio10TargetGenerator: extend DOM-like generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1905
| * | | | | | | cmVisualStudio10TargetGenerator: extend DOM-like generationVitaly Stakhovsky2018-03-312-79/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local Elem class is extended with more XML-generating functions. WriteGroups() is rewritten to use these new functions, avoiding BuildFileStream.
* | | | | | | | Merge topic 'msvc-toolset-version-variable'Brad King2018-04-0510-135/+103
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45bf6f6246 Modules: Use MSVC_TOOLSET_VERSION variable to simplify logic 304f493e57 MSVC: Add MSVC_TOOLSET_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1882
| * | | | | | | | Modules: Use MSVC_TOOLSET_VERSION variable to simplify logicArkady Shapkin2018-04-045-134/+48
| | | | | | | | |
generated by cgit v0.12 at 2025-01-25 06:04:27 (GMT)