summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| * | | | | | VS: Add Elem::Content() helper and usage demoVitaly Stakhovsky2018-04-262-18/+21
| | | | | | |
| * | | | | | cmVisualStudio10TargetGenerator: refactoring (continued)Vitaly Stakhovsky2018-04-242-32/+50
| | | | | | |
* | | | | | | Merge topic 'numeric-indent'Brad King2018-04-265-68/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d407b438d cmVisualStudioGeneratorOptions: specify indentation with integer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2008
| * | | | | | | cmVisualStudioGeneratorOptions: specify indentation with integerVitaly Stakhovsky2018-04-255-68/+68
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.11'Brad King2018-04-260-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'backport-java-new-packaging' into release-3.11Brad King2018-04-253-23/+91
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2007
* | \ \ \ \ \ \ Merge topic 'java-new-packaging'Brad King2018-04-263-23/+91
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea54a9c666 Merge branch 'backport-java-new-packaging' into java-new-packaging 5482f485b8 FindJava, FindJNI, UseJava: update for version 10 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2007
| * | | | | | | Merge branch 'backport-java-new-packaging' into java-new-packagingBrad King2018-04-253-23/+91
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | | Fix conflicts by combining the changes from both sides.
| | * | | | | FindJava, FindJNI, UseJava: update for version 10 supportMarc Chevrier2018-04-253-23/+91
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new version format * new registry layout on Windows Fixes: #17938
* | | | | | CMake Nightly Date StampKitware Robot2018-04-261-1/+1
|/ / / / /
* | | | | Merge branch 'release-3.11'Brad King2018-04-250-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'BLAS-no-target-in-libs' into release-3.11Brad King2018-04-242-2/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2006
| * \ \ \ \ Merge branch 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir' into release-3.11Brad King2018-04-241-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2001
* | \ \ \ \ \ Merge topic 'BLAS-no-target-in-libs'Brad King2018-04-252-2/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d756f37cc FindBLAS: do not write an imported target name into BLAS_LIBRARIES 946846aaf5 FindPkgConfig: do not unset unused variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2006
| * | | | | | FindBLAS: do not write an imported target name into BLAS_LIBRARIESRolf Eike Beer2018-04-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~177^2 (FindBLAS: optionally query pkg-config for a library, 2017-12-15) the `BLAS_LIBRARIES` result variable may incorrectly contain the name of an imported target. Instead store the list of libraries in the variable. Unfortunately pkg_check_modules does not provide a way to get this so we need to use a (temporary) hack of reading `INTERFACE_LINK_LIBRARIES` from the interface library target. Fixes: #17934
| * | | | | | FindPkgConfig: do not unset unused variableRolf Eike Beer2018-04-241-1/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | _props is never used, it was a leftover from a development step.
* | | | | | Merge topic 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir'Brad King2018-04-251-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 60cb75e4a1 Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2001
| * | | | | Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build treeMarc Chevrier2018-04-241-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~480^2 (UseJava: add_jar OUTPUT_DIR option used only for jar generation, 2017-10-12) added code of the form `file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR})`. This exposed an existing bug in `CMAKE_DISABLE_SOURCE_CHANGES` in which it does not recognize that the top of the build tree itself is in the build tree. Fix that now. Fixes: #17933
* | | | | Merge topic 'vs-dedup-custom-commands'Brad King2018-04-258-20/+87
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f59c33a763 VS: Generate a custom command only in the least dependent target d58d4daa6b cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10Generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1889
| * | | | | VS: Generate a custom command only in the least dependent targetFujii Hironori2018-04-238-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a custom command is assigned to multiple targets, generate the build rule only in the least-dependent `.vcxproj` file. Otherwise MSBuild will run the command on the first build of a dependent target even if its dependencies already brought the command up to date (in order to populates its build log). Generate targets in least-to-most-dependent order, and assign a custom command to the least dependent target. Added cmLocalVisualStudio10Generator::GenerateTargetsDepthFirst to call cmVisualStudio10TargetGenerator::Generate in least-dependent order. Moved SourcesVisited from cmVisualStudio10TargetGenerator to cmLocalVisualStudio10Generator to avoid attaching a custom command to multiple targets among the local generator. Fixes: #16767
| * | | | | cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10GeneratorFujii Hironori2018-04-172-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the type of a member variable `LocalGenerator` from `cmLocalVisualStudio7Generator` to `cmLocalVisualStudio10Generator`.
* | | | | | Merge topic 'vs-hlsl-object-name'Brad King2018-04-254-0/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1ccbc693 VS: Add VS_SHADER_OBJECT_FILE_NAME source file property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1997
| * | | | | | VS: Add VS_SHADER_OBJECT_FILE_NAME source file propertyJeremiah van Oosten2018-04-244-0/+21
| | |_|_|_|/ | |/| | | |
generated by cgit v0.12 at 2025-01-20 14:48:28 (GMT)