summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* export: Implement EXPORT subcommand (#9822)Stephen Kelly2013-12-244-59/+148
| | | | | | Teach the export command to handle export sets defined by invocations of install(TARGETS ... EXPORT foo). This makes maintenance of targets exported to both the build tree and install tree trivial.
* Merge topic 'update-kwsys'Brad King2013-12-233-0/+155
|\ | | | | | | | | | | f4fcfc6 Merge branch 'upstream-kwsys' into update-kwsys 7aa3c20 KWSys 2013-12-19 (2426b57d)
| * Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-12-203-0/+155
| |
* | Merge topic 'wix-cmake-coding-conventions'Brad King2013-12-238-108/+108
|\ \ | | | | | | | | | | | | 37a1157 CPackWiX: adhere to CMake member naming convention
| * | CPackWiX: adhere to CMake member naming conventionNils Gladitz2013-12-208-108/+108
| |/
* | Merge topic 'fix-Qt-rcc-file-handling'Brad King2013-12-231-1/+10
|\ \ | | | | | | | | | | | | 870bd16 QtAutogen: Don't modify target source files while iterating them.
| * | QtAutogen: Don't modify target source files while iterating them.Stephen Kelly2013-12-201-1/+10
| |/ | | | | | | | | | | | | Populate a separate vector of files and append them separately. This was the pattern used prior to commit 035b6908 (Autogen: Split AutoRcc handling into two methods, 2013-12-10), which was erroneously not maintained in that refactoring.
* | Merge topic 'vs-external-project-type'Brad King2013-12-233-2/+39
|\ \ | | | | | | | | | | | | a79cbdc VS: Teach include_external_msproject about non-C++ projects (#14661)
| * | VS: Teach include_external_msproject about non-C++ projects (#14661)David Golub2013-12-203-2/+39
| |/ | | | | | | | | | | Teach CMake to guess the project type guid based on the project file extension. This allows non-C++ projects like *.vbproj or *.csproj to be included.
* | Merge topic 'remove-VTK-include-hack'Brad King2013-12-231-21/+0
|\ \ | | | | | | | | | | | | db7d111 cmLocalGenerator: Remove VTK include hack (#11338).
| * | cmLocalGenerator: Remove VTK include hack (#11338).Stephen Kelly2013-12-201-21/+0
| |/ | | | | | | | | This exists for pre-CMake 2.4 compatibility. All such compatibility code was removed for CMake 3.0, so remove this too.
* | Merge topic 'constify'Brad King2013-12-231-1/+1
|\ \ | | | | | | | | | | | | ae6fc55 cmGlobalGenerator: Fix value type pushed into autogens vector
| * | cmGlobalGenerator: Fix value type pushed into autogens vectorBrad King2013-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit changed the AutogensType::value_type to be "std::pair<cmQtAutoGenerators,cmTarget const*>" but our std::make_pair call returns "std::pair<cmQtAutoGenerators,cmTarget*>". Construct the value_type directly instead of using make_pair. Otherwise the Sun 5.9 compiler complains ".../Source/cmGlobalGenerator.cxx", line 1281: Error: Formal argument x of type "const std::pair<cmQtAutoGenerators, const cmTarget*>&" in call to "std::vector<std::pair<cmQtAutoGenerators, const cmTarget*> > ::push_back(const std::pair<cmQtAutoGenerators, const cmTarget*>&)" is being passed "std::pair<cmQtAutoGenerators, cmTarget*>".
* | | Merge topic 'wix-fix-registry-slash'Brad King2013-12-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 7eea71e CPackWiX: replace slash with backslash in registry key path
| * | | CPackWiX: replace slash with backslash in registry key pathNils Gladitz2013-12-201-1/+1
| | | | | | | | | | | | | | | | Forward slash is not understood as a key path separator.
* | | | CMake Nightly Date StampKitware Robot2013-12-231-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-12-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-12-211-1/+1
| |_|/ |/| |
* | | Merge topic 'minor-cleanup'Brad King2013-12-206-48/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b51b6e9 Export: Skip INTERFACE libraries when generating -config files. cad5c79 cmTarget: Fix typo 08e72a3 Automoc: Fix style 2eda924 Genex: Use case-sensitive comparison in PLATFORM_ID. 9436353 Genex: Always return immediately on error. 20a06d0 Export: Clean up comment. f4d9466 Genex: Accept arbitrary content in *_CASE and MAKE_C_IDENTIFIER. d36b489 Genex: Allow single param expressions to accept arbirary input. 218ad35 Constify cmStrCmp. 4cb7d79 Help: Fix CMP0037 docs. 5187580 Help: Add missing period.
| * | | Export: Skip INTERFACE libraries when generating -config files.Stephen Kelly2013-12-191-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties object has just been created, so is always empty, which means the if block is never entered. The following lines do not have any effect because an INTERFACE library has no LOCATION. At the end, no code is generated for INTERFACE libraries in config-specific exported files, so skip them early.
| * | | cmTarget: Fix typoStephen Kelly2013-12-191-1/+1
| | | | | | | | | | | | | | | | 'a ALIAS' -> 'an ALIAS'
| * | | Automoc: Fix styleStephen Kelly2013-12-191-3/+3
| | | | | | | | | | | | | | | | Insert whitespace before operators.
| * | | Genex: Use case-sensitive comparison in PLATFORM_ID.Stephen Kelly2013-12-191-1/+1
| | | |
| * | | Genex: Always return immediately on error.Stephen Kelly2013-12-191-0/+4
| | | |
| * | | Export: Clean up comment.Stephen Kelly2013-12-191-2/+0
| | | | | | | | | | | | | | | | | | | | Introduced in commit a4263c9f (export(): Handle multiple dependent export sets., 2013-10-10)
| * | | Genex: Accept arbitrary content in *_CASE and MAKE_C_IDENTIFIER.Stephen Kelly2013-12-191-0/+6
| | | |
| * | | Genex: Allow single param expressions to accept arbirary input.Stephen Kelly2013-12-191-31/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing single-parameter expressions work due to special casing which assumes that if there is only one parameter, and the node accepts arbitrary content, then the result is the input. This is true for the existing expressions matching that pattern - namely the "1" and "TARGET_NAME" expressions. However, the LOWER_CASE, and UPPER_CASE expressions should also accept arbitrary content, and in their case, the result is not the input. Refactor the cmGeneratorExpressionEvaluator to allow that extension. Actually evaluate the "1" and "0" nodes.
| * | | Constify cmStrCmp.Stephen Kelly2013-12-191-3/+3
| | | |
* | | | Merge topic 'make-entry-no-parallel'Brad King2013-12-204-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bd11de0 Makefile: Allow "gmake target1 target2 -j" (#14312)
| * | | | Makefile: Allow "gmake target1 target2 -j" (#14312)Brad King2013-12-204-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the .NOTPARALLEL target to each local Makefile command-line interface entry point file so that even with -j we launch only one "make -f Makefile2" at a time. The actual build rules in Makefile2 and lower will still run in parallel. Do not add .NOTPARALLEL for Borland or Watcom make tools because they do not tolerate it. Other make tools that do not understand .NOTPARALLEL will not be hurt. Suggested-by: Robert Luberda <robert-cmake@debian.org>
* | | | | Merge topic 'update-kwsys'Brad King2013-12-206-9/+44
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 2a943d9 Merge branch 'upstream-kwsys' into update-kwsys f788d9a KWSys 2013-12-19 (88165c5e)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-12-196-9/+44
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2013-12-201-1/+1
|/ / /
* | | Merge topic 'wix-fragment-injection'Brad King2013-12-195-0/+306
|\ \ \ | | | | | | | | | | | | | | | | 8632233 CPackWiX: allow customization of generated WiX sources
| * | | CPackWiX: allow customization of generated WiX sourcesNils Gladitz2013-12-175-0/+306
| | | | | | | | | | | | | | | | | | | | | | | | Added a new variable CPACK_WIX_PATCH_FILE that users can point at an XML patch file. Fragments defined within the patch file will be inserted at supported insertion points (currently Component, File and Directory).
* | | | Merge topic 'minor-cleanup'Brad King2013-12-192-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e2cb3e7 Help: Note that COMPATIBLE_INTERFACE_ properties may be origin-debugged. 41e48c4 Avoid certain actions on IMPORTED targets.
| * | | | Avoid certain actions on IMPORTED targets.Stephen Kelly2013-12-112-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we're iterating over IMPORTED targets now, handle them in the loop body. The existing behavior is harmless because generally nothing is done anyway for IMPORTED targets in these code paths, because they do not have sources for example.
* | | | | Merge topic 'constify'Brad King2013-12-1936-180/+226
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c62cd3e Constify autogen handling. 035b690 Autogen: Split AutoRcc handling into two methods 2fcafbf cmLocalGenerator: Constify target definitions access a54eedd Constify cmGeneratorTarget access. 9edee62 Constify handling of link targets. ef25ba8 Constify handling of target dependencies.
| * | | | Constify autogen handling.Stephen Kelly2013-12-113-15/+18
| | | | |
| * | | | Autogen: Split AutoRcc handling into two methodsStephen Kelly2013-12-112-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | The initialize method changes the target, whereas the setup method does not.
| * | | | cmLocalGenerator: Constify target definitions accessStephen Kelly2013-12-112-3/+4
| | | | |
| * | | | Constify cmGeneratorTarget access.Stephen Kelly2013-12-113-3/+4
| | | | |
| * | | | Constify handling of link targets.Stephen Kelly2013-12-118-34/+41
| | | | |
| * | | | Constify handling of target dependencies.Stephen Kelly2013-12-1124-105/+122
| | | | |
* | | | | Merge topic 'remove-INTERFACE-build-targets'Brad King2013-12-195-78/+44
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 97fae68 Remove INTERFACE build targets.
| * | | | Remove INTERFACE build targets.Stephen Kelly2013-12-105-78/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b04f3b9a (Create make rules for INTERFACE_LIBRARY targets., 2013-08-21) extended the makefile generator to create build targets for INTERFACE_LIBRARY targets. No other generators were extended with this feature. This conflicts with the feature of whitelisting of target properties read from INTERFACE_LIBRARY targets. The INTERFACE_* properties of the INTERFACE_LIBRARY may legitimately contain TARGET_PROPERTY generator expressions for reading properties from the 'head target'. The 'head target' would be the INTERFACE_LIBRARY itself when creating the build rules for it, which means that non-whitelisted properties would be read.
* | | | | Merge topic 'KateFixNinja'Brad King2013-12-192-57/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3d20c2 kate: fix ninja support 1eaf2f2 kate: remove unused function
| * | | | | kate: fix ninja supportAlex Neundorf2013-12-192-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ninja needs to be run from the toplevel build dir, not from the target dir, as make Alex
| * | | | | kate: remove unused functionAlex Neundorf2013-12-192-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | Merge topic 'fix-INTERFACE-mapped-config'Brad King2013-12-191-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b8e56a Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
generated by cgit v0.12 at 2025-01-09 14:34:18 (GMT)