summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'code-improvements'Brad King2018-05-023-47/+45
|\ | | | | | | | | | | | | | | | | | | 0c47ed6430 cmMakefile: Convert private helpers to file static functions e13fa223fc cmMakefile: Improve ExpandVariablesInString return type b542e0c74f cmCPluginAPI: Remove a few unnecessary c_str() calls Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !2018
| * cmMakefile: Convert private helpers to file static functionsVitaly Stakhovsky2018-05-012-33/+30
| | | | | | | | | | | | The two-argument forms of `AddDefineFlag` and `RemoveDefineFlag` need no access to `cmMakefile` class members. They are used only within the implementation file.
| * cmMakefile: Improve ExpandVariablesInString return typeVitaly Stakhovsky2018-05-013-11/+12
| | | | | | | | | | Return `std::string const&` instead of a `const char*` that points into a string anyway. Update call sites accordingly.
| * cmCPluginAPI: Remove a few unnecessary c_str() callsVitaly Stakhovsky2018-05-011-3/+3
| |
* | CMake Nightly Date StampKitware Robot2018-05-021-1/+1
| |
* | Merge topic 'source_group-empty-prefix'Brad King2018-05-011-1/+5
|\ \ | | | | | | | | | | | | | | | | | | b3baa97e80 Source_Group: Allow an empty prefix with the TREE syntax. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2022
| * | Source_Group: Allow an empty prefix with the TREE syntax.Yohann Benedic2018-04-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling source_group(TREE <root> PREFIX "" FILES ...) the files located at the root directory were not assigned to the correct source group: they were put in a default group (e.g. "Source Files" in Visual Studio). Fixes: #17608
* | | Merge topic 'doc-wiki-links'Brad King2018-05-014-9/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 052743556b Modules: Update documented links to CMake community Wiki Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2023
| * | | Modules: Update documented links to CMake community WikiBrad King2018-04-304-9/+7
| | | | | | | | | | | | | | | | The wiki has moved. Update links to reference the new pages.
* | | | CMake Nightly Date StampKitware Robot2018-05-011-1/+1
|/ / /
* | | Merge topic 'cpack_docs_cleanup'Brad King2018-04-303-82/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9a8687121f Help: Improve accuracy, readability and cross-referencing of cpack docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2013
| * | | Help: Improve accuracy, readability and cross-referencing of cpack docsCraig Scott2018-04-273-82/+76
| | | | | | | | | | | | | | | | | | | | | | | | This is primarily a cleanup of the cpack(1) page. The cpack.cxx file and CPack module were also updated to make the docs relating to the generator specification and option names consistent in all three places.
* | | | Merge branch 'release-3.11'Brad King2018-04-300-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'cxx-checks-tolerate-more-warnings' into release-3.11Brad King2018-04-301-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2019
| * \ \ \ \ Merge branch 'java-new-packaging-version-sort' into release-3.11Brad King2018-04-272-7/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2016
* | \ \ \ \ \ Merge topic 'cxx-checks-tolerate-more-warnings'Brad King2018-04-301-0/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2254b72061 C++ feature checks: Filter out warnings caused by local configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2019
| * | | | | | C++ feature checks: Filter out warnings caused by local configurationBrad King2018-04-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some environments the linker produces warnings like warning: directory not found for option warning: object file compiled with -mlong-branch ... These do not affect the availability of C++ features we're checking, so filter them out. Fixes: #17850, #17947
* | | | | | | Merge topic 'java-new-packaging-version-sort'Brad King2018-04-302-7/+31
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1013560a6a FindJava, FindJNI: Ensure most recent version is searched first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2016
| * | | | | | FindJava, FindJNI: Ensure most recent version is searched firstMarc Chevrier2018-04-272-7/+31
| | | | | | |
* | | | | | | Merge topic 'vs-shader-generator-expressions'Brad King2018-04-302-6/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83ed65cdde Add generator expressions for VS_SHADER_ source file properties. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2000
| * | | | | | | Add generator expressions for VS_SHADER_ source file properties.Jeremiah van Oosten2018-04-262-6/+41
| | | | | | | |
* | | | | | | | Merge topic 'doc_required_vs_component'Brad King2018-04-301-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d94754b2a7 Help: Add hint to required VS 2017 component for C++/CLI support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2015
| * | | | | | | Help: Add hint to required VS 2017 component for C++/CLI supportMichael Stürmer2018-04-271-0/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-301-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-291-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-281-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'vs-refactor-xml'Brad King2018-04-272-56/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4465a27882 cmVisualStudio10TargetGenerator: XML refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2012
| * | | | | | cmVisualStudio10TargetGenerator: XML refactoringVitaly Stakhovsky2018-04-262-56/+49
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'vs-managed-fastlink'Brad King2018-04-271-0/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27b28c001f VS: Don't turn on /DEBUG:FASTLINK for managed C++ targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2011
| * | | | | VS: Don't turn on /DEBUG:FASTLINK for managed C++ targetsCalum Robinson2018-04-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FastLink is only supported for native C++ targets. Turning it off avoids a warning when building managed C++.
* | | | | | CMake Nightly Date StampKitware Robot2018-04-271-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'csharp_reference_imported_targets'Brad King2018-04-2625-82/+475
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de549083e3 cmVisualStudio10TargetGenerator: warn if /clr flag is set manually 59ec7d50bd cmVisualStudio10TargetGenerator: fix for backward compatibility 663f5120f4 cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced() 359544a907 add tests for using target_link_libraries() with imported managed targets 43571073e0 cmVisualStudio10TargetGenerator: store managed reference information in maps 16fec7e2fc cmVisualStudio10TargetGenerator: make some methods config aware f3c6828876 cmVisualStudio10TargetGenerator: /clr compatible flags for managed tgt f9042d807d remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1805
| * | | | | cmVisualStudio10TargetGenerator: warn if /clr flag is set manuallyMichael Stürmer2018-04-241-2/+14
| | | | | |
| * | | | | cmVisualStudio10TargetGenerator: fix for backward compatibilityMichael Stürmer2018-04-241-5/+18
| | | | | |
| * | | | | cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced()Michael Stürmer2018-04-243-17/+4
| | | | | |
| * | | | | add tests for using target_link_libraries() with imported managed targetsMichael Stürmer2018-04-2418-0/+332
| | | | | |
| * | | | | cmVisualStudio10TargetGenerator: store managed reference information in mapsMichael Stürmer2018-04-242-7/+60
| | | | | |
| * | | | | cmVisualStudio10TargetGenerator: make some methods config awareMichael Stürmer2018-04-232-12/+22
| | | | | |
| * | | | | cmVisualStudio10TargetGenerator: /clr compatible flags for managed tgtMichael Stürmer2018-04-231-1/+6
| | | | | |
| * | | | | remove TargetIsCSharpOnly() and use methods from cmGeneratorTargetMichael Stürmer2018-04-234-40/+14
| | | | | |
| * | | | | cmExportFileGenerator: set IMPORTED_COMMON_LANGUAGE_RUNTIME for CSharp targetMichael Stürmer2018-04-231-2/+7
| | | | | |
| * | | | | cmGeneratorTarget: change GetManagedType() result if language is CSharpMichael Stürmer2018-04-231-3/+5
| | | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-04-260-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'backport-ninja-issue-17942' into release-3.11Brad King2018-04-262-1/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2010
* | \ \ \ \ \ Merge topic 'ninja-issue-17942'Brad King2018-04-266-4/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee44f390ce Ninja: Make assumed source dependencies order-only 625b8f9076 Ninja: Avoid empty phony edges for target ordering ae6722483e Merge branch 'backport-ninja-issue-17942' into ninja-issue-17942 0826c20128 Ninja: Do not add empty custom command for file(GENERATE) outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2010
| * | | | | | | Ninja: Make assumed source dependencies order-onlyBrad King2018-04-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since its beginning the Ninja generator has handled `GENERATED` source files that have no custom command producing them by writing a dummy custom command for them that depends on the target ordering phony edge. Make the custom command's dependency order-only since the phony edge also has only order-only dependencies. The dummy custom command should never be considered "dirty" by `ninja`. Fixes: #17942
| * | | | | | | Ninja: Avoid empty phony edges for target orderingBrad King2018-04-264-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~230^2~2 (ninja: break unnecessary target dependencies, 2017-04-17) we unconditionally generate a phony edge for target ordering. It is needed in case a later target depends on it. However, if the phony edge has no inputs then `ninja -d explain` prints: ninja explain: output ... of phony edge with no inputs doesn't exist Furthermore the phony edge's output is considered dirty and can cause dependents to be incorrectly considered dirty. Avoid this by always generating at least one input to the target ordering phony edges. If we have no real dependencies just use a path that always exists. Fixes: #17942
| * | | | | | | Merge branch 'backport-ninja-issue-17942' into ninja-issue-17942Brad King2018-04-262-1/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Ninja: Do not add empty custom command for file(GENERATE) outputsBrad King2018-04-262-1/+9
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally we mark `file(GENERATE)` outputs as `GENERATED` in order to tell custom command dependency tracing logic not to expect the files to exist on disk yet. This is because we do not generate the files until after that tracing is done. The Ninja generator also interprets the `GENERATED` property to mean that it is expected that some build rule will generate the file if another build rule depends on it. If the generator does not know of a custom command that generates the file then it adds an empty one so that the `ninja` build tool does not complain about a dependency on a file that does not exist and has no rule to generate it. However, this step is not necessary for `file(GENERATE)` outputs because there is no build rule to generate them and they will exist before `ninja` runs. Add an additional `__CMAKE_GENERATED_BY_CMAKE` property internally to tell the Ninja generator that a `GENERATED` file will exist before the build starts and is not expected to have a build rule producing it. Fixes: #17942
* | | | | | | Merge topic 'vs-refactor-xml'Brad King2018-04-262-50/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfff12c808 VS: Add Elem::Content() helper and usage demo 1f29777798 cmVisualStudio10TargetGenerator: refactoring (continued) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2005
generated by cgit v0.12 at 2025-09-09 08:59:53 (GMT)