summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-04-171-1/+1
|
* Merge topic 'vs-cuda-pdb'Brad King2018-04-161-0/+14
|\ | | | | | | | | | | | | 134e795fa9 VS: Add workaround for CUDA compiler PDB location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1960
| * VS: Add workaround for CUDA compiler PDB locationBrad King2018-04-131-0/+14
| | | | | | | | | | | | | | | | | | The CUDA Toolkit Visual Studio Integration does not honor the `ClCompile.ProgramDataBaseFileName` field when telling `nvcc` how to invoke `cl`. Work around this problem by passing `-Xcompiler=-Fd...` ourselves through `AdditionalOptions`. Fixes: #17647
* | Merge topic 'fix-explicit-CMakeLists.txt'Brad King2018-04-164-9/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | 0a122393d7 Merge branch 'backport-fix-explicit-CMakeLists.txt' 8480c2afc0 Restore support for explicitly referenced CMakeLists.txt sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1959
| * \ Merge branch 'backport-fix-explicit-CMakeLists.txt'Brad King2018-04-134-9/+36
| |\ \
| | * | Restore support for explicitly referenced CMakeLists.txt sourcesBrad King2018-04-134-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~467^2 (VS,Xcode: Add CMakeLists.txt sources without mutating targets, 2017-10-18) we do not add `CMakeLists.txt` to target sources but instead generate references to them directly. This broke projects that explicitly specify their `CMakeLists.txt` file as a source file because the explicit entry is no longer consolidated with the generated one. Teach the relevant generators to avoid duplicating `CMakeLists.txt` source references and add test cases. Fixes: #17828
* | | | CMake Nightly Date StampKitware Robot2018-04-161-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-04-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-04-141-1/+1
| |_|/ |/| |
* | | Merge topic 'update-kwsys'Brad King2018-04-131-2/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 5ebbf2807b Merge branch 'upstream-KWSys' into update-kwsys e488f73873 KWSys 2018-04-12 (9da3e5bc) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1953
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-04-121-2/+0
| | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-04-12 (9da3e5bc)
* | | CMake Nightly Date StampKitware Robot2018-04-131-1/+1
|/ /
* | Merge topic 'add_support_for_clr_targets'Brad King2018-04-1211-24/+151
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 312527de47 document COMMON_LANGUAGE_RUNTIME target properties 4b7a82b4ed cmVisualStudio10TargetGenerator: set /clr compiler flag from property 20e31fb4c9 cmExportFileGenerator: add target property for managed targets 411a22706a cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary() fb433ff283 cmGeneratorTarget: Make import library checks config-aware 4c1f33961f cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods 6c517a9f8d cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1916
| * | cmVisualStudio10TargetGenerator: set /clr compiler flag from propertyMichael Stürmer2018-04-051-0/+16
| | |
| * | cmExportFileGenerator: add target property for managed targetsMichael Stürmer2018-04-051-0/+14
| | |
| * | cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary()Michael Stürmer2018-04-051-1/+4
| | |
| * | cmGeneratorTarget: Make import library checks config-awareMichael Stürmer2018-04-059-23/+26
| | |
| * | cmGeneratorTarget: add GetManagedType() and CheckManagedType() methodsMichael Stürmer2018-04-052-0/+73
| | |
| * | cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages()Michael Stürmer2018-04-052-0/+18
| | |
* | | Merge topic 'variable_watch-on-PARENT_SCOPE'Brad King2018-04-121-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 65198cfd0f variable_watch: trigger on variables set via PARENT_SCOPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1948
| * | | variable_watch: trigger on variables set via PARENT_SCOPEMatteo Settenvini2018-04-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we also trigger variable watches when a variable is set in the parent scope. Fixes: #17827
* | | | Merge topic 'attr-escape'Brad King2018-04-121-47/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff18dce5ed cmVisualStudio10TargetGenerator: Properly escape attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1937
| * | | | cmVisualStudio10TargetGenerator: Properly escape attributesVitaly Stakhovsky2018-04-061-47/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to common XML escape characters, attributes require escaping the double quote character. A new function, cmVS10EscapeAttr is added and used where appropriate.
* | | | | CMake Nightly Date StampKitware Robot2018-04-121-1/+1
| | | | |
* | | | | Merge topic 'cpack-trace-nullptr'Brad King2018-04-111-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-4/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | CMake Nightly Date StampKitware Robot2018-04-111-1/+1
| | | | |
* | | | | Merge topic 'fix-crash-trace-exp-uninit-vars'Brad King2018-04-102-8/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-092-8/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | CMake Nightly Date StampKitware Robot2018-04-101-1/+1
| | | |
* | | | 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 'ninja-fortran-rspfile'Brad King2018-04-061-69/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0614-35/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|/ | |/| | |
* | | | | 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-0616-54/+616
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add glob verify support to XCode, VS, Ninja, and Makefile generatorsShane Parris2018-04-029-54/+227
| | | | | | |