summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* KWSys Nightly Date StampKWSys Robot2012-03-291-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-03-281-1/+1
|
* Merge topic 'AutomocProperCMakeEscaping_13018'David Cole2012-03-272-10/+18
|\ | | | | | | | | | | | | 9b32475 automoc: add define to test which caused bug #13018 2066511 automoc: fix #13018, proper cmake escaping to avoid false rebuilds c652812 make cmLocalGenerator::EscapeForCMake() static
| * automoc: fix #13018, proper cmake escaping to avoid false rebuildsAlex Neundorf2012-03-261-9/+17
| | | | | | | | | | | | | | | | | | | | The variables stored in the AutomocInfo.cmake file were not properly escaped, so when reading them back they could turn into lists, if they contained double quotes initially. This patch fixes this by using cmLocalGenerator::EscapeForCMake() to escape the variables properly. Alex
| * make cmLocalGenerator::EscapeForCMake() staticAlex Neundorf2012-03-261-1/+1
| | | | | | | | | | | | This way it can be used also if there is no cmLocalGenerator instance around Alex
* | Merge topic 'ninja-generator'David Cole2012-03-271-0/+4
|\ \ | | | | | | | | | | | | 6b5614f Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
| * | Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flagsPeter Collingbourne2012-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Patch by Amine Khaldi! Also, start using the -MT flag to set a target name for depfiles. This works around a bug observed in distcc, as explained in the comment. Based on a patch by Alexander Usov.
* | | KWSys Nightly Date StampKWSys Robot2012-03-271-1/+1
| |/ |/|
* | KWSys Nightly Date StampKWSys Robot2012-03-261-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-03-251-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-03-241-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-03-231-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-03-221-1/+1
| |
* | Merge topic 'vs10-object-items'David Cole2012-03-214-91/+60
|\ \ | | | | | | | | | | | | | | | b291d9e VS10: Fix external objects generated outside target (#13047) 328c0f6 Simplify cmVisualStudio10TargetGenerator source classification
| * | VS10: Fix external objects generated outside target (#13047)Brad King2012-03-201-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9a6ff950 (Fix for bug where VS2010 did not use .obj files, 2011-04-01) assumed that if an external object is GENERATED that it is the output of a custom command in the current target. If it is generated by another target then VS will not automatically include the external object in the current target. This bug was preserved by the refactoring in the parent commit. Instead use <None> for external objects generated by a custom command in the current target and <Object> for all other external objects. Update the ExternalOBJ test to cover this case.
| * | Simplify cmVisualStudio10TargetGenerator source classificationBrad King2012-03-194-91/+69
| | | | | | | | | | | | | | | | | | Combine WriteCLSources and WriteObjSources into a single method. Use the cmGeneratorTarget source classification to simplify tool selection for each source file. Extend the classification to handle .idl files.
* | | Merge topic 'ImprovedCOMPONENTSSupportInFindPackage2'David Cole2012-03-211-9/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d100f9 find_package: Test rejection of required+optional components d81d83c add macro check_required_components() to configure_package_config_file() b15c0b4 FPHSA(): add HANDLE_COMPONENTS option 34108cd find_package: add documentation for OPTIONAL_COMPONENTS cdabde8 FPHSA(): add missing "]" to documentation f2e0a18 find_package: add OPTIONAL_COMPONENTS keyword
| * | | find_package: add documentation for OPTIONAL_COMPONENTSAlex Neundorf2012-03-191-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds documentation for OPTIONAL_COMPONENTS to cmFindPackage.cxx, and also extends Modules/readme.txt significantly with regard to how components should be handled. Alex
| * | | find_package: add OPTIONAL_COMPONENTS keywordAlex Neundorf2012-03-191-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an OPTIONAL_COMPONENTS keyword to find_package() so we can have a clear distinction between required and optional components. Don't allow a component to be both required and optional. Alex
* | | | KWSys Nightly Date StampKWSys Robot2012-03-211-1/+1
| | | |
* | | | Merge topic 'ninja-generator'David Cole2012-03-201-1/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | c337c7e Ninja: Fix <OBJECT_DIR> substitution
| * | | Ninja: Fix <OBJECT_DIR> substitutionPeter Kuemmel2012-03-191-1/+4
| | | | | | | | | | | | | | | | Don't forget the subdirectories.
* | | | Merge topic 'object-library'David Cole2012-03-2049-477/+1360
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93d5509 Merge branch 'ninja-object-library' into object-library 821037c Merge branch 'xcode-object-library' into object-library eb24c99 Merge branch 'object-library' into xcode-object-library 63d1be8 Xcode: Honor $<TARGET_OBJECTS:...> source expressions 020ba38 Merge branch 'object-library' into xcode-object-library e8ea615 Build object library targets in Xcode 8045e17 Pre-compute object file names before Xcode generation 247a132 Allow txt files as ExtraSources in object library targets b063599 Add a default source group for object files. be01f3b Xcode: Re-factor some existing methods into "FromPath" variants 2693dbe Merge branch 'object-library' into ninja-object-library 51997cb Ninja: Honor $<TARGET_OBJECTS:...> source expressions 23ec258 Merge branch 'object-library' into ninja-object-library 61124de Build object library targets in Ninja f5b06cd Pre-compute object file names before Ninja generation a2514f1 Simplify cmNinjaTargetGenerator using cmGeneratorTarget ...
| * | | Merge branch 'ninja-object-library' into object-libraryBrad King2012-03-1916-1/+3095
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ninja-object-library: (37 commits) Ninja: Honor $<TARGET_OBJECTS:...> source expressions Build object library targets in Ninja Pre-compute object file names before Ninja generation Simplify cmNinjaTargetGenerator using cmGeneratorTarget Ninja: Avoid using 'this' in member initializers Ninja: Fix for PDB files with spaces in the path. Ninja: Constify use of cmCustomCommand Ninja: add /DEF: flag to linker call Ninja: Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator. Ninja: Add friend struct so it can access the private ConvertToNinjaPath. Ninja: add .def file support Ninja: ensure the output dir exists at compile time Ninja: Remove an unnecessary variable Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands Ninja: Add a missed license header Ninja: CMake: Adapt Ninja generator for per-target include dirs Ninja: windows msvc: create for each target a .pdb file Ninja: Import library support for Windows Ninja: mark the Windows specific hacks with a comment only Ninja: disable unfinished Windows ninja support ...
| | * \ \ Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-161-0/+20
| | |\ \ \
| | * | | | Ninja: Honor $<TARGET_OBJECTS:...> source expressionsBrad King2012-03-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add objects from object libraries referenced using this syntax to the set of objects linked in a target.
| | * | | | Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-169-7/+278
| | |\ \ \ \
| | * | | | | Build object library targets in NinjaBrad King2012-03-164-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat OBJECT libraries as STATIC libraries but leave out the archive step. The object files will be left behind for reference by other targets later.
| | * | | | | Pre-compute object file names before Ninja generationBrad King2012-03-165-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement cmGlobalGenerator::ComputeTargetObjects in the Ninja generator to pre-compute all the object file names. Use the results during generation instead of re-computing it later.
| | * | | | | Simplify cmNinjaTargetGenerator using cmGeneratorTargetBrad King2012-03-162-43/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the classification of source files in this generator using that computed by cmGeneratorTarget.
| | * | | | | Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-16193-1360/+1745
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'object-library' into xcode-object-libraryBrad King2012-03-191-0/+20
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Document OBJECT library type in add_library commandBrad King2012-03-161-0/+20
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe the OBJECT library signature of add_library and the $<TARGET_OBJECTS:...> expressions needed to use object libraries. Also document the what is not allowed for object library targets.
| * | | | | | Xcode: Honor $<TARGET_OBJECTS:...> source expressionsDavid Cole2012-03-191-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add objects from object libraries referenced using this syntax to the set of objects linked in a target.
| * | | | | | Merge branch 'object-library' into xcode-object-libraryBrad King2012-03-199-7/+278
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add $<TARGET_OBJECTS:...> expression to use an object libraryBrad King2012-03-169-7/+278
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | For now do not allow an OBJECT library to reference other object libraries. Teach cmTarget::ComputeLinkImplementation to include the languages of object libraries used by a target.
| * | | | | Build object library targets in XcodeDavid Cole2012-03-191-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat OBJECT libraries as STATIC libraries. The Xcode project file format provides no way to avoid running the libtool so hide the resulting .a away next to the object files as it should never be referenced. The object files will be left behind for reference by other targets later.
| * | | | | Pre-compute object file names before Xcode generationDavid Cole2012-03-192-0/+51
| | | | | |
| * | | | | Allow txt files as ExtraSources in object library targetsDavid Cole2012-03-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary for the Xcode generator, in which the CMakeLists.txt files are added as sources merely for convenient access, without any associated custom command.
| * | | | | Add a default source group for object files.David Cole2012-03-161-0/+1
| | | | | |
| * | | | | Xcode: Re-factor some existing methods into "FromPath" variantsDavid Cole2012-03-162-48/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to avoid depending on cmSourceFile instances. Prep work for supporting OBJECT_LIBRARY in the Xcode generator.
| * | | | | Xcode: Re-factor code into GetObjectsNormalDirectory methodDavid Cole2012-03-162-9/+27
| |/ / / / | | | | | | | | | | | | | | | | | | | | ...in preparation for calling it from more than one location. Required to support OBJECT_LIBRARY targets in Xcode.
| * | | | Build object library targets in VSBrad King2012-03-133-21/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat OBJECT libraries as STATIC libraries. The VS project file format provides no way to avoid running the librarian so hide the resulting .lib away next to the object files as it should never be referenced. The object files will be left behind for reference by other targets later.
| * | | | Build object library targets in MakefilesBrad King2012-03-136-11/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat OBJECT libraries as STATIC libraries but leave out the archive step. The object files will be left behind for reference by other targets later.
| * | | | Add OBJECT_LIBRARY target typeBrad King2012-03-1312-4/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This library type can compile sources to object files but does not link or archive them. It will be useful to reference from executable and normal library targets for direct inclusion of object files in them. Diagnose and reject the following as errors: * An OBJECT library may not be referenced in target_link_libraries. * An OBJECT library may contain only compiling sources and supporting headers and custom commands. Other source types that are not normally ignored are not allowed. * An OBJECT library may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands. * An OBJECT library may not be installed, exported, or imported. Some of these cases may be supported in the future but are not for now. Teach the VS generator that OBJECT_LIBRARY targets are "linkable" just like STATIC_LIBRARY targets for the LinkLibraryDependencies behavior.
| * | | | Pre-compute and store target object directory in cmGeneratorTargetBrad King2012-03-123-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cmGeneratorTarget::ObjectDirectory member to hold the value. In ComputeTargetObjects set the value to the full path to the target object directory including any necessary placeholder for the configuration name.
| * | | | Rename/constify build-time config placeholder lookupBrad King2012-03-098-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename cmGlobalGenerator::GetCMakeCFG{InitDirectory => IntDir} to have a shorter name without a typo. Add a 'const' qualifier since the method is only for lookup and never needs to modify anything.
| * | | | Remove unused cmSourceGroup methodBrad King2012-03-092-7/+0
| | | | | | | | | | | | | | | | | | | | The non-const GetSourceFiles method is not needed.
| * | | | Pre-compute object file names before VS project generationBrad King2012-03-0910-136/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement cmGlobalGenerator::ComputeTargetObjects in the VS generator to pre-compute all the object file names. Use the results during generation instead of re-computing it later.
| * | | | Pre-compute object file names before Makefile generationBrad King2012-03-098-55/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a virtual cmGlobalGenerator::ComputeTargetObjects method invoked during cmGeneratorTarget construction. Implement it in the Makefile generator to pre-compute all object file names for each target. Use the results during generation instead of re-computing it later.
generated by cgit v0.12 at 2024-11-12 20:41:15 (GMT)