summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ctest-xml-minor-cleanup'Brad King2015-05-284-15/+6
|\ | | | | | | | | | | b26e5b55 CTest: Generate NamedMeasurement elements directly into xml file 965cf8e6 CTest: Drop stray content from Configure.xml
| * CTest: Generate NamedMeasurement elements directly into xml fileDaniel Pfeifer2015-05-263-10/+6
| | | | | | | | Re-order the logic to avoid use of a temporary std::ostringstream.
| * CTest: Drop stray content from Configure.xmlDaniel Pfeifer2015-05-261-5/+0
| | | | | | | | | | Remove content left accidentally since commit v2.4.0~2876 (some bug fixes for my recent checkins and some more cleanup, 2004-09-07).
* | Merge topic 'ctest-update-gmake-error-match'Brad King2015-05-281-2/+2
|\ \ | | | | | | | | | | | | 44a4e545 ctest_build: Fix regression in GNU make error message matching
| * | ctest_build: Fix regression in GNU make error message matchingZack Galbreath2015-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | The regex update in commit v3.1.2~4^2 (ctest_build: Update GNU make error message matching, 2015-01-28) broke matching of the messages it updated. Remove the escape character before the square brackets added by that commit.
* | | CMake Nightly Date StampKitware Robot2015-05-281-1/+1
| | |
* | | Merge topic 'inject-state-snapshot'Brad King2015-05-2774-274/+390
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b880a07 cmLocalGenerator: Require a valid cmState::Snapshot in the ctor. e12afe76 cmState: Host some state from the cmGlobalGenerator. c7b79aa1 cmGlobalGenerator: Require a cmake instance in ctor. 01e1cd5c cmState: Move snapshot creation to the cmake instance.
| * | | cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.Stephen Kelly2015-05-2738-64/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the local generator creation API to accept a cmState::Snapshot. Adjust MakeLocalGenerator to use the 'current' snapshot in cases where there is no parent. Create the snapshot for subdirectories in cmMakefile::AddSubdirectory. This means that snapshots are now created at the point of extending the tree, as appropriate, and independently of the cmLocalGenerator and cmMakefile they represent the state for.
| * | | cmState: Host some state from the cmGlobalGenerator.Stephen Kelly2015-05-2713-42/+113
| | | |
| * | | cmGlobalGenerator: Require a cmake instance in ctor.Stephen Kelly2015-05-2752-149/+124
| | | | | | | | | | | | | | | | It is required anyway, so this makes it explicit.
| * | | cmState: Move snapshot creation to the cmake instance.Stephen Kelly2015-05-245-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a snapshot in Initialize(), but leave the creation responsibility to the cmake instance instead. Previously, the cmState would Initialize() in its constructor, and the cmake instance would re-Initialize() during Configure(). The end result was the same and there would be one snapshot present. However, cmLocalGenerator also created a snapshot on construction, and that one was used, leaving the first snapshot unused, and potential for off-by-one errors. Fix that by making the cmLocalGenerator use the existing snapshot if it is top-level. Add a CurrentSnapshot to the cmake instance and populated it while configuring a directory. This will eventually replace the 'current local generator' concept. Fix the GetParent implementation to be able to return the first snapshot.
* | | | Merge topic 'clean-up-GHS'Brad King2015-05-273-44/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f69dcdfc GHS: Remove call to SetCurrentLocalGenerator. a4d230af GHS: Don't attempt to generate for IMPORTED or INTERFACE targets. 550e08b0 GHS: Remove unnecessary condition. d34467cd GHS: Remove unused CustomCommandUseLocal. 9afc9e84 GHS: Remove BuildFileName. 73245e59 GHS: Remove unnecessary Configure override.
| * | | GHS: Remove call to SetCurrentLocalGenerator.Stephen Kelly2015-05-241-3/+1
| | | | | | | | | | | | | | | | It is not needed as cmLocalGenerator::Configure does this.
| * | | GHS: Don't attempt to generate for IMPORTED or INTERFACE targets.Stephen Kelly2015-05-241-0/+5
| | | |
| * | | GHS: Remove unnecessary condition.Stephen Kelly2015-05-241-7/+5
| | | |
| * | | GHS: Remove unused CustomCommandUseLocal.Stephen Kelly2015-05-241-3/+0
| | | | | | | | | | | | | | | | | | | | This was copied from the VS generator. It is not an override of a base class method.
| * | | GHS: Remove BuildFileName.Stephen Kelly2015-05-241-5/+0
| | | | | | | | | | | | | | | | It is never read or written.
| * | | GHS: Remove unnecessary Configure override.Stephen Kelly2015-05-242-28/+0
| | | | | | | | | | | | | | | | | | | | This only sets a member variable which is never read. Presumably this was copied from the makefile generator.
* | | | Merge topic 'minor-cleanups'Brad King2015-05-276-38/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5b0a0fb cmMakefile: Don't pop the directory listfile off the stack. e40fcb59 cmMakefile: Simplify convert condition. 4fdad392 cmake: Remove redundant forward declaration. df9635f3 cmake: Remove redundant condition. ad167479 foreach: Remove unused variables. aaeec642 cmGlobalGenerator: De-virtualize methods with no overrides. 444bc349 Ninja: Remove some bogus comments.
| * | | | cmMakefile: Don't pop the directory listfile off the stack.Stephen Kelly2015-05-251-16/+10
| | | | | | | | | | | | | | | | | | | | Simplify the IssueMessage implementation.
| * | | | cmMakefile: Simplify convert condition.Stephen Kelly2015-05-251-2/+1
| |/ / / | | | | | | | | | | | | The CallStack is checked above.
| * | | cmake: Remove redundant forward declaration.Stephen Kelly2015-05-241-1/+0
| | | | | | | | | | | | | | | | The appropriate include is already here.
| * | | cmake: Remove redundant condition.Stephen Kelly2015-05-241-5/+0
| | | |
| * | | foreach: Remove unused variables.Stephen Kelly2015-05-241-2/+0
| | | |
| * | | cmGlobalGenerator: De-virtualize methods with no overrides.Stephen Kelly2015-05-241-3/+3
| | | |
| * | | Ninja: Remove some bogus comments.Stephen Kelly2015-05-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | The virtual methods are overrides not overloads, the constructor is no longer a default variant, the destructor and GetCMakeInstance comments add no value, only a typo.
* | | | Merge topic 'ninja-per-target-rules'Brad King2015-05-271-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9da84ab6 Ninja: Fix regression in .rsp file support
| * | | | Ninja: Fix regression in .rsp file supportBrad King2015-05-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a390de65 (Ninja: Generate separate compile and link rules for each target, 2015-05-18) we removed the _RSP_FILE suffix from rule names meant for targets that need to build with a .rsp file because we now use per-target rules anyway. Remove this suffix from references to the rule too. Reported-by: Herz Thomas <Thomas.Herz@kuka.com>
* | | | | CMake Nightly Date StampKitware Robot2015-05-271-1/+1
| | | | |
* | | | | Merge topic 'extend-visibility-properties'Brad King2015-05-264-13/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 700f1c3b Honor visibility properties for all target types (#15556) 50de5dbb Help: Format visibility property and variable documentation 771f1b00 Tests: Rename Visibility{InlinesHidden =>} ab55b3b5 Tests: Refactor RunCMake.VisibilityPreset test setup
| * | | | | Honor visibility properties for all target types (#15556)Brad King2015-05-264-13/+55
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The <LANG>_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN were first merged in commit v2.8.12~322 (Merge topic 'VISIBILITY_PRESET-property', 2013-06-05) but worked only for shared libraries and executables with exports. Prior to commit v3.0.0-rc1~581^2 (GenerateExportHeader: Deprecate add_compiler_export_flags function., 2013-09-02) the add_compiler_export_flags function was used to add visibility flags to all targets. The visibility flags are useful for sources in all target types because they may be later linked into shared libraries or executables with exports. Introduce policy CMP0063 to enable them for all target types while preserving compatibility with existing projects that do not expect this.
* | | | | Merge topic 'run-include-what-you-use'Brad King2015-05-261-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b3475ba5 Makefile: Fix <LANG>_INCLUDE_WHAT_YOU_USE with CTEST_USE_LAUNCHERS
| * | | | | Makefile: Fix <LANG>_INCLUDE_WHAT_YOU_USE with CTEST_USE_LAUNCHERSBrad King2015-05-221-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'ctest --launch' command must be placed before the IWYU launcher on the compiler command line. Extend the RunCMake.IncludeWhatYouUse test to cover this case. The Ninja generator already does it correctly.
* | | | | | CMake Nightly Date StampKitware Robot2015-05-261-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-05-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-05-241-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-05-231-1/+1
| |/ / / |/| | |
* | | | Merge topic 'clean-up-backtrace-handling'Brad King2015-05-224-51/+86
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b4b9631 cmake: Add IssueMessage overload taking a single cmListFileContext. 46656aa1 cmake: Extract displayMessage method. 55fc5e7c cmake: Extract printMessageText method. ca7cc2eb cmake: Extract PrintMessagePreamble method. fa752bf3 cmake: Move isError determination to a more-natural place.
| * | | | cmake: Add IssueMessage overload taking a single cmListFileContext.Stephen Kelly2015-05-214-26/+44
| | | | | | | | | | | | | | | | | | | | Port appropriate clients to use it.
| * | | | cmake: Extract displayMessage method.Stephen Kelly2015-05-211-19/+25
| | | | |
| * | | | cmake: Extract printMessageText method.Stephen Kelly2015-05-211-7/+9
| | | | |
| * | | | cmake: Extract PrintMessagePreamble method.Stephen Kelly2015-05-212-8/+19
| | | | |
| * | | | cmake: Move isError determination to a more-natural place.Stephen Kelly2015-05-211-5/+3
| | | | |
* | | | | Merge topic 'vs-cleanup-internal-configs'Brad King2015-05-2210-176/+119
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2f4bb4e9 VS: Do not accumulate configurations globally (#15577)
| * | | | | VS: Do not accumulate configurations globally (#15577)Brad King2015-05-2110-176/+119
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the VS >= 7 generator's global Configurations member and instead lookup configurations using cmMakefile::GetConfigurations where needed. This avoids accumulating all CMAKE_CONFIGURATION_TYPES values ever encountered by a project() or enable_language() command and allows the final value to be used in each directory. We don't officially support per-directory CMAKE_CONFIGURATION_TYPES values but we certainly should not generate configurations not in the final value in the top level directory.
* | | | | Merge topic 'revert-extra-qbs-generator'Brad King2015-05-224-316/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | deec97d8 Revert "Qbs: Add new 'extra' generator for qbs project files"
| * | | | | Revert "Qbs: Add new 'extra' generator for qbs project files"Brad King2015-05-214-316/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f85db2f32358e6de921aba7d1cb8ecb81da934c0. Discussion by the QtCreator community at https://bugreports.qt.io/browse/QTCREATORBUG-13695 raises concerns about this particular approach to working with CMake projects using QtCreator. Also, the functionality and design of the QBS extra generator was never discussed on the CMake mailing list or with QtCreator developers. There may be better ways to make the two tools work together. In order to avoid committing to long-term support of this generator prior to such discussion taking place, revert it from CMake for now. We may restore this or use an alternative design based on results of such discussion.
* | | | | CMake Nightly Date StampKitware Robot2015-05-221-1/+1
|/ / / /
* | | | Merge topic 'clean-up-cmLocalGenerator'Brad King2015-05-215-26/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e54d2fdf Convert: Remove specification of default parameter. 20c2fe4d cmLocalGenerator: Get enabled languages from cmState. 7601a7b1 cmLocalGenerator: Implement IsRootMakefile in terms of cmState. 4080ca49 cmLocalGenerator: Inline ReadListFile method. ad706819 cmLocalGenerator: Devirtualize method.
| * | | | Convert: Remove specification of default parameter.Stephen Kelly2015-05-204-7/+5
| | | | |
generated by cgit v0.12 at 2025-01-28 12:54:58 (GMT)