summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: don't parse empty stringPeter Kümmel2013-11-041-5/+8
|
* CMake Nightly Date StampKitware Robot2013-11-041-1/+1
|
* CMake Nightly Date StampKitware Robot2013-11-031-1/+1
|
* Merge topic 'archive-skip-symlink-on-windows'Brad King2013-11-021-20/+29
|\ | | | | | | | | | | 4c383b5 cmake: Avoid '-E tar' failure to extract symlinks on Windows (#13251) 0d8552c cmSystemTools: Re-order extract_tar logic
| * cmake: Avoid '-E tar' failure to extract symlinks on Windows (#13251)Brad King2013-11-011-0/+8
| | | | | | | | | | | | | | If a symlink fails to extract and the host system is Windows then report a warning and skip the entry instead of failing. This will allow archives containing symbolic links to be extracted on Windows with somewhat gracefully degraded behavior.
| * cmSystemTools: Re-order extract_tar logicBrad King2013-11-011-20/+21
| | | | | | | | | | | | | | Simplify extraction message logic to be easier to follow and to write a newline before any error messages that may be produced. Also flip handling of the archive_write_header return code to handle success in the "then" case and failure in the "else" case.
* | Merge topic 'cmake-gui-warning'Brad King2013-11-021-22/+22
|\ \ | | | | | | | | | | | | 82bacea cmake-gui: Rename local variable to avoid shadowing a member
| * | cmake-gui: Rename local variable to avoid shadowing a memberBrad King2013-11-011-22/+22
| |/ | | | | | | | | | | | | | | | | | | | | Address warnings: Source/QtDialog/CMakeSetupDialog.cxx:1233:15: warning: declaration of 'cursor' shadows a member of 'this' [-Wshadow] Source/QtDialog/CMakeSetupDialog.cxx:1260:15: warning: declaration of 'cursor' shadows a member of 'this' [-Wshadow] by renaming the local variable to 'textCursor'.
* | Merge topic 'ctest-p4'Brad King2013-11-021-11/+1
|\ \ | | | | | | | | | | | | 1b54b1d ctest_update: Do not remove the p4 depot name
| * | ctest_update: Do not remove the p4 depot namePedro Navarro2013-11-011-11/+1
| | | | | | | | | | | | | | | | | | Instead of removing the depot name, which causes problems when looking at the file change list in CDash, make the Update test remove a given prefix from the files retrieved from Update.xml.
* | | Merge topic 'object-library-no-TARGET_FILE'Brad King2013-11-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | d960589 Genex: Reject $<TARGET_FILE:...> for object libraries (#14532)
| * | | Genex: Reject $<TARGET_FILE:...> for object libraries (#14532)Brad King2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the cmGeneratorExpressionEvaluator filesystem artifact logic to reject OBJECT_LIBRARY targets since they have no main artifact. Without the explicit rejection evaluation falls through to an internal CMake error message in cmTarget::GetOutputInfo. Extend the RunCMake.GeneratorExpression test to cover these cases.
* | | | Merge topic 'object-library-missing-source'Brad King2013-11-021-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5a2fc3d Check for OBJECT_LIBRARY source files at start of generation
| * | | | Check for OBJECT_LIBRARY source files at start of generationBrad King2013-11-011-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Teach cmGlobalGenerator::CheckTargets to include OBJECT_LIBRARY targets in the check for source file existence. Extend the RunCMake.ObjectLibrary test to cover this case.
* | | | Merge topic 'doc-rst-note-and-productionlist'Brad King2013-11-022-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 450b515 cmRST: Add support for the note and productionlist directives
| * | | | cmRST: Add support for the note and productionlist directivesBrad King2013-10-302-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply print out the lines as normal paragraph text. Teach the CMakeLib.testRST test to cover this syntax. Update the cmake-developer.7 manual to document support for the directives.
* | | | | Merge topic 'revert-accidental-changes'Brad King2013-11-022-20/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13aea6d cmFindCommon: Revert accidental change 4064d6f target_link_libraries: Revert accidental change
| * | | | | cmFindCommon: Revert accidental changeBrad King2013-11-021-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29) we accidentally changed the cmFindCommon.cxx logic in a way that looks like a local experiment leftover that went unnoticed due to the size of the other changes in the commit. Revert it.
| * | | | | target_link_libraries: Revert accidental changeBrad King2013-11-021-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit c4373b33 (cmTarget: Make GetProperty() const, 2013-10-29) we accidentally changed the cmTargetLinkLibrariesCommand.cxx logic in a way that looks like a local experiment leftover that went unnoticed due to the size of the other changes in the commit. Revert it.
* | | | | | CMake Nightly Date StampKitware Robot2013-11-021-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'fix-duplicate-test-run'Brad King2013-11-011-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2eccdbd CTest: prevent tests from being inserted in the cost list twice
| * | | | | CTest: prevent tests from being inserted in the cost list twiceNils Gladitz2013-10-311-1/+8
| | |_|_|/ | |/| | |
* | | | | Merge topic 'constify'Brad King2013-11-0119-233/+273
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | c4373b3 cmTarget: Make GetProperty() const. cfb6661 Don't call SetProperty from GetProperty.
| * | | | cmTarget: Make GetProperty() const.Stephen Kelly2013-10-3119-229/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has follow-on effects for other methods and classes. Further work on making the use of const cmTarget pointers common can be done, particularly with a view to generate-time methods.
| * | | | Don't call SetProperty from GetProperty.Stephen Kelly2013-10-301-4/+10
| | | | | | | | | | | | | | | | | | | | Memoize with the internal container directly instead.
* | | | | Merge topic 'cmake-syntax-recorded-brackets'Brad King2013-11-011-49/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b54dbeb Test foreach/function/macro handling of bracket arguments ccdf7e0 macro: Do not substitute for placeholders in bracket arguments 999abb9 macro: Add extra indentation to placeholder substitution code
| * | | | | macro: Do not substitute for placeholders in bracket argumentsBrad King2013-10-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the macro command implementation to avoid substituting macro placeholders in bracket arguments recorded inside the macro block.
| * | | | | macro: Add extra indentation to placeholder substitution codeBrad King2013-10-301-51/+51
| |/ / / / | | | | | | | | | | | | | | | | | | | | The next commit will make this block conditional so pre-indent it to clarify the simplicity of the change.
* | | | | CMake Nightly Date StampKitware Robot2013-11-011-1/+1
| |/ / / |/| | |
* | | | Merge topic 'use-generator-target'Brad King2013-10-316-321/+320
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 07f5788 Move TraceDependencies to cmGeneratorTarget. fa03777 Do not populate SourceEntries in AddSourceFile.
| * | | | Move TraceDependencies to cmGeneratorTarget.Stephen Kelly2013-10-306-317/+318
| | | | |
| * | | | Do not populate SourceEntries in AddSourceFile.Stephen Kelly2013-10-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It only generates a default constructed SourceEntry for each cmSourceFile. this->Internal->SourceEntries[sf]; in cmTargetTraceDependencies::Trace has the same effect, and is called early in generation-time for each source file anyway.
* | | | | Merge topic 'fix-ninja-launcher-errors-from-custom'Brad King2013-10-312-2/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fcb97e Tests: Add test for CTEST_USE_LAUNCHERS capture of custom commands 05c7042 Ninja: run custom commands through launcher if available
| * | | | | Ninja: run custom commands through launcher if availableNils Gladitz2013-10-312-2/+43
| | | | | |
* | | | | | Merge topic 'vs-generator-names'Brad King2013-10-318-63/+169
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29071fe VS: Add version year to generator names
| * | | | | | VS: Add version year to generator namesBrad King2013-10-288-63/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the Visual Studio >= 10 generators to indicate the version year: Visual Studio 10 => Visual Studio 10 2010 Visual Studio 11 => Visual Studio 11 2012 Visual Studio 12 => Visual Stduio 12 2013 Report the names with the year to the list of available generators so that the cmake-gui drop-down shows the years. When selecting a generator from the "-G" option or from an existing CMAKE_GENERATOR cache entry, recognize names without the years for compatibility and map them to the names with years. Update the generator names in the cmake-generators.7 manual.
* | | | | | | CMake Nightly Date StampKitware Robot2013-10-311-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'use-generator-target'Brad King2013-10-307-95/+127
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | 638843a Remove the Location member from cmTarget. 90ef1cf Move GenerateTargetManifest to cmGeneratorTarget. 25f1df3 Split CreateGeneratorTargets into two methods.
| * | | | Remove the Location member from cmTarget.Stephen Kelly2013-10-292-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is never used. Presumably it only exists so that a const char * can be returned from GetLocation. However, that is getting in the way now, so use a static std::string instead, which is already a common pattern in cmake.
| * | | | Move GenerateTargetManifest to cmGeneratorTarget.Stephen Kelly2013-10-275-76/+83
| | | | |
| * | | | Split CreateGeneratorTargets into two methods.Stephen Kelly2013-10-274-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | As the generate-time-related API is moving to cmGeneratorTarget, almost all of generation code needs to be able to access instances of it.
* | | | | Merge topic 'fix-coverage-over-multiple-projects'Brad King2013-10-301-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eb1d6ce CTest: clean TargetDirs between unrelated coverage runs (issue 13143)
| * | | | | CTest: clean TargetDirs between unrelated coverage runs (issue 13143)Nils Gladitz2013-10-291-0/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-10-301-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'fix-custom-source-with-flags-crash'Brad King2013-10-291-1/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | f037b9b Generators: don't append sources from utility targets to objectSources
| * | | | Generators: don't append sources from utility targets to objectSourcesNils Gladitz2013-10-281-1/+8
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-10-291-1/+1
| | | | |
* | | | | Merge topic 'Qt-auto-generators'Brad King2013-10-2810-176/+937
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c87d9c Add automatic rcc invocation for Qt. 84218e1 Add automatic uic invocation for Qt. 94a0ca6 Record which files are skipped by automoc. 18fb758 Run the main executable created in the autogen tests. e485ba1 Rename the QtAutomoc tests to QtAutogen. 7ce65c3 Add extra checks for the AUTOMOC target property. 32771fc Update output messages for generic use. f371ab5 Rename RunAutomoc to RunAutogen. 85b3d6e Extract an SetupAutoMocTarget method. ca124a1 Rename the AutomocInfo.cmake file to be more generic. a342c9f Move some makefile definitions up away from moc-specific code. 98632ef Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER. 63378ba Rename some variables to reflect broader scope. 97f1aa3 Rename method to reflect generic use. 4abb111 Rename local variable to reflect generic use. 03878c9 Move variable set to where it is used. ...
| * | | | Add automatic rcc invocation for Qt.Stephen Kelly2013-10-244-1/+296
| | | | | | | | | | | | | | | | | | | | | | | | | This replaces the need to invoke qt4_add_resources by allowing adding the source .qrc file directly to the target sources.
| * | | | Add automatic uic invocation for Qt.Stephen Kelly2013-10-247-14/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source files are already processed by cmQtAutomoc to look for moc includes, so extend that to also look for ui_ includes and find corresponding .ui files to process. This replaces the need to invoke qt4_wrap_ui(). As the ui files are not likely to be part of the SOURCES of the target, store the options associated with them separately in the cmMakefile for querying during the autogen run.