summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmTarget: Make the source files depend on the config.Stephen Kelly2014-04-0226-137/+334
| | | | | | | | | | | | | | | | | Disallow the use of config-specific source files with the Visual Studio and Xcode generators. They don't have any way to represent the condition currently. Use the same common-config API in cmQtAutoGenerators. While it accepts config-specific files, it doesn't have to support multiple configurations yet. Loop over the configs in cmTargetTraceDependencies and cmGlobalGenerator::WriteSummary and consume all source files. Loop over the configs in cmComputeTargetDepends and compute the object library dependencies for each config.
* cmGeneratorTarget: Don't add computed sources to the target.Stephen Kelly2014-04-021-1/+5
| | | | | | | | | | | | | | | When config-specifig generator expressions are supported, a target may have SOURCES: src1.cpp $<$<CONFIG:Debug>:src2.cpp> $<$<CONFIG:Release>:src3.cpp> and computation in cmTargetTraceDependencies would add each of the src2.cpp and src3.cpp sources back to the target without a config-guard. That would make the sources be used later when generating the buildsystem, regardless of the configuration. Avoid calling AddSource on the target with the result of the GetSourceFiles call.
* cmComputeTargetDepends: Use valid config to compute target depends.Stephen Kelly2014-04-021-17/+4
| | | | | | | | | | | | | | | | | If CMAKE_BUILD_TYPE is set, and user code contains: target_link_libraries(myexe prefix_$<$<CONFIG:Debug>:debug>) then the computation with an empty config was computing a target-level dependency on a target or library called prefix_, and a dependency on a target or library called prefix_debug (as expected). The existing logic skips 'prefix_' because it is not a known target, and defers to the link-dependencies logic to find the library. The link-dependencies logic does not incorrectly handle the config as cmComputeTargetDepends did, and so did not encounter 'prefix_' during its computation. This likely had no effect on the generated buildsystem.
* cmGeneratorTarget: Compute target objects on demandStephen Kelly2014-04-025-56/+30
| | | | | | | | | | | | | | | | | | | | | Add a ComputeObjectMapping method to compute the object names. It takes mapping to populate as an out-parameter so that it can be extended in the future with parameters relevant to generator expression evaluation. Remove the supporting cmGeneratorTarget::AddObject method. It is no longer needed as the container member is populated directly. The ComputeObjectMapping method is called whenever objects are requested from the cmGeneratorTarget. Because the Xcode generator makes no such request, explicitly invoke the method from that generator so that the logic of checking for bad sources in object libraries is executed. In a follow-up, the UseObjectLibraries usage may be replaced by a true generator expression evaluator for TARGET_OBJECTS. That will require generators to use cmGeneratorTarget::GetExternalObjects which is not currently the case for Xcode and VS generators.
* cmTarget: Compute languages from object libraries on demand.Stephen Kelly2014-04-022-25/+47
|
* cmGeneratorTarget: Compute consumed object libraries on demand.Stephen Kelly2014-04-023-57/+19
| | | | | | | Remove up-front object library computation from cmGlobalGenerator. Adjust tests for message coming from the generator expression evaluation.
* cmComputeTargetDepends: Track object library depends.Stephen Kelly2014-04-022-1/+29
| | | | Relieve cmGeneratorTarget of that responsibility.
* cmTarget: Allow any generator expression in SOURCES property.Stephen Kelly2014-04-027-41/+62
| | | | | | | | | | | | | | | | Remove use of UseObjectLibraries from Makefile and Ninja generators. It is not needed now because those generators use GetExternalObjects which already contains the objects from object libraries. The VS10 generator calls both the UseObjectLibraries and the GetExternalObjects methods. Ensure that duplicates are not created by skipping objects from object libraries in handling of GetExternalObjects. Similarly, fix VS6, VS7 and Xcode object handling by skipping external objects from OBJECT_LIBRARY usage as appropriate. The error message in the BadSourceExpression1 test is now reported by the generator expression evaluator, so it has different text.
* cmTarget: Include TARGET_OBJECTS genex in target SOURCES property.Stephen Kelly2014-04-023-11/+64
| | | | Add policy CMP0051 to control this behavior.
* cmGlobalGenerator: Add interface to call ForceLinkerLanguagesStephen Kelly2014-03-313-1/+9
| | | | | Avoid calling it too early when cmGeneratorTarget instances don't yet exist.
* cmStringCommand: Add GENEX_STRIP subcommand.Stephen Kelly2014-03-312-0/+26
| | | | Strip out any generator expressions in the input string.
* Genex: Evaluate TARGET_OBJECTS as a normal expression.Stephen Kelly2014-03-313-0/+80
|
* cmTarget: Store strings instead of cmSourceFile* to represent SOURCES.Stephen Kelly2014-03-312-42/+135
| | | | | | | This will allow the strings to contain generator expressions. At this point, generator expressions are still not part of the SOURCES property when it is read.
* cmSourceFileLocation: Collapse full path for directory comparisons.Stephen Kelly2014-03-311-0/+5
| | | | | | | | | | | | | Otherwise Matches() ends up doing a comparison of the directories /path/to/dir/subdir/.. and /path/to/dir as strings and not matching where it should.
* cmSourceFileLocation: Remove unused Update method.Stephen Kelly2014-03-312-26/+0
| | | | | The string overload is never called. This allows the removal of the unused UpdateDirectory method.
* cmTarget: Remove AddSourceFile methodStephen Kelly2014-03-312-12/+5
| | | | It is no longer used.
* cmTarget: Use string API to add sources to cmTarget objects.Stephen Kelly2014-03-318-23/+21
| | | | | Continue to call GetOrCreateSource where necessary to create cmSourceFile objects which have the GENERATED attribute set.
* cmTarget: Add a method to obtain list of filenames for sources.Stephen Kelly2014-03-313-12/+27
|
* cmSourceFileLocation: Make copyable and assignable.Stephen Kelly2014-03-312-0/+44
| | | | This allows using it in containers and algorithms.
* cmTarget: Rename AddSource method for backward compatibility.Stephen Kelly2014-03-314-5/+11
| | | | Add a new AddSource method for future use.
* cmTarget: Use GetSourceFiles for languages.Stephen Kelly2014-03-311-1/+3
|
* cmGeneratorTarget: Compute the object directory early.Stephen Kelly2014-03-311-1/+1
| | | | Ensure it is populated before tracing dependencies.
* CMake Nightly Date StampKitware Robot2014-03-311-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-301-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-291-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-281-1/+1
|
* Merge topic 'osx-CFBundle-info-plist'Brad King2014-03-271-1/+1
|\ | | | | | | | | 90e22f8f OS X: Fix Info.plist placement in a CFBundle
| * OS X: Fix Info.plist placement in a CFBundleTim Blechmann2014-03-261-1/+1
| | | | | | | | | | | | | | Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the same root directory as the rest of the bundle. Without this, Info.plist was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because the target path was not generated correctly.
* | CMake Nightly Date StampKitware Robot2014-03-271-1/+1
| |
* | Merge topic 'fix-Qt-Autogen'Brad King2014-03-262-5/+10
|\ \ | | | | | | | | | | | | | | | 71a11252 QtAutogen: Fix use of multiple ui files in a single target. 261acd91 QtAutogen: Use the basename for resource files.
| * | QtAutogen: Fix use of multiple ui files in a single target.Stephen Kelly2014-03-252-5/+8
| | | | | | | | | | | | | | | | | | Don't store a mapping of the directory to the ui file. The directory will be a unique key, allowing only one ui file to be specified. Use the source file name instead as the mapping key.
| * | QtAutogen: Use the basename for resource files.Stephen Kelly2014-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rcc tool generates a cpp file with a symbol called qInitResources or called qInitResources_${name}, if the name is passed. The qInitResources symbol clashes if multiple qrc files are used in one target. Always pass the name to ensure that the symbol is unique. This is also the behavior of the qtx_add_resource macros.
| * | Merge branch 'add_custom_command-no-INTERFACE-lib' into releaseBrad King2014-03-192-1/+10
| |\ \
* | \ \ Merge topic 'dev/custom-ninja-deptypes'Brad King2014-03-261-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9523d2a5 ninja: Add support for custom depfile formats
| * | | | ninja: Add support for custom depfile formatsBen Boeckel2014-03-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not everything that isn't MSVC is GCC. I have support for LDC's depfile format on its way upstream[1], but its future is uncertain. CMake should at least support this for future depfile formats. [1]https://github.com/martine/ninja/pull/721
* | | | | Merge topic 'remove-CMakeFiles-advice'Brad King2014-03-261-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)
| * | | | | cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)Brad King2014-03-211-4/+4
| | | | | |
* | | | | | Merge topic 'haiku-updates'Brad King2014-03-262-0/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cc42b87 Haiku: Fix compiler detection when using distcc 84603d80 Haiku: Enable CMake builtin ELF editor
| * | | | | | Haiku: Enable CMake builtin ELF editorAdrien Destugues2014-03-212-0/+38
| |/ / / / / | | | | | | | | | | | | | | | | | | Co-Author: Brad King <brad.king@kitware.com>
* | | | | | Merge topic 'report-INTERFACE-type-in-conflict'Brad King2014-03-261-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.
| * | | | | | cmMakefile: Report type of INTERFACE library in conflict.Stephen Kelly2014-03-201-0/+3
| |/ / / / /
* | | | | | Merge topic 'update-kwsys'Brad King2014-03-261-4/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys 12faf00d KWSys 2014-03-19 (a8aa1014)
| * | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-03-201-4/+9
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2014-03-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-03-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-03-241-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-03-231-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-211-1/+1
|/ / /
* | | Merge topic 'watcom-updates'Brad King2014-03-205-5/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux 5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version 9292d3b8 Watcom: Detect compiler target architecture and platform fbc883c9 Watcom: Add one blank line to Makefile for better readability
generated by cgit v0.12 at 2024-11-08 14:44:26 (GMT)