summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-masterBrad King2013-11-0322-154/+231
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Source/cmTarget.cxx by integrating the changes to the internal copy constructor from both sides. Also resolve a logical conflict by dropping the special case for INTERFACE_LIBRARY targets. Since cmTarget::SetMakefile already forces CMP0022 to NEW for such targets we need no special handling. Resolve conflict in Source/cmTargetLinkLibrariesCommand.h by dropping the documentation change. We will make the same change in the new location of the same documentation in a separate commit. Resolve conflicts in Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt Tests/RunCMake/CMP0022/RunCMakeTest.cmake by taking the side from the 'policy-CMP0022-fixes' branch.
| * CMP0022: Warn about a given target at most onceBrad King2013-11-037-3/+25
| | | | | | | | | | | | | | | | | | | | | | Since cmTarget::ComputeLinkInterface is called separately for each "head" target that links a target, the warning we produce when CMP0022 is not set could be repeated. Add explicit logic to allow the warning to appear at most once. Multiple copies of the warning for the same target are almost always identical and therefore redundant. In the rare case that two copies of the warning are different, the second can appear in a future run after the first is fixed.
| * Do not export INTERFACE_LINK_LIBRARIES from non-linkable targetsBrad King2013-11-024-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cmExportFileGenerator::SetImportLinkInterface exports the old LINK_INTERFACE_LIBRARIES property values it skips doing so for non-linkable targets because target->GetLinkInterface returns NULL for such targets. Since cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty looks at the INTERFACE_LINK_LIBRARIES property directly instead of using the computed link interface, teach it to skip exporting the property if target->IsLinkable returns false. Extend the RunCMake.CMP0022 test with a case covering this. Simply export an executable target that links to a library that is not exported.
| * CMP0022: Plain target_link_libraries must populate link interfaceBrad King2013-11-0211-151/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMP0022 NEW behavior is that the INTERFACE_LINK_LIBRARIES property exactly defines the link interface. The plain target_link_libraries signature says linking is transitive by default, so it should populate the property. Teach the target_link_libraries plain signature to populate the INTERFACE_LINK_LIBRARIES regardless of the CMP0022 setting. Refactor the cmTarget::ComputeLinkInterface checks that warn when the policy is not set to compare the new property to either the explicitly set old link interface properties or the link implementation fallback for all linkable target types, not just static libraries. This fixes a regression in 2.8.12.0 that caused target_link_libraries to not implement transitive linking in the plain signature once the policy CMP0022 is set to NEW.
| * CMP0022: Add test for target_link_libraries plain signatureStephen Kelly2013-11-026-0/+56
| |
| * CMP0022: Add unit test for null pointer check and message.Stephen Kelly2013-11-024-0/+29
| |
| * Merge branch 'output-CMP0022-entries' into policy-CMP0022-fixesBrad King2013-11-022-1/+35
| |\
* | \ 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-023-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1b54b1d ctest_update: Do not remove the p4 depot name
| * | | | ctest_update: Do not remove the p4 depot namePedro Navarro2013-11-013-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'doc-FindBoost-updates'Brad King2013-11-021-33/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f53878b FindBoost: Clarify example static libs option (#13663) a42a665 FindBoost: Refine .rst formatting
| * | | | | FindBoost: Clarify example static libs option (#13663)Brad King2013-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | State explicitly in the example that it will only find static libraries.
| * | | | | FindBoost: Refine .rst formattingBrad King2013-11-011-32/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Move the '::' starting literal blocks to the end of the preceding paragraph. Convert the "Boost CMake" divider to a section header.
* | | | | Merge topic 'object-library-no-TARGET_FILE'Brad King2013-11-026-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d960589 Genex: Reject $<TARGET_FILE:...> for object libraries (#14532)
| * | | | | Genex: Reject $<TARGET_FILE:...> for object libraries (#14532)Brad King2013-11-016-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-025-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a2fc3d Check for OBJECT_LIBRARY source files at start of generation
| * | | | | | Check for OBJECT_LIBRARY source files at start of generationBrad King2013-11-015-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-025-0/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 450b515 cmRST: Add support for the note and productionlist directives
| * | | | | | cmRST: Add support for the note and productionlist directivesBrad King2013-10-305-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'doc-manual-toctree-depth'Brad King2013-11-016-0/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c76e44e Help: Limit reference manual toctree depth to 1
| * | | | | | | Help: Limit reference manual toctree depth to 1Brad King2013-11-016-0/+36
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a :maxdepth: option to all toctree directives to limit their depth to 1. We do not want subheadings from individual documents to pollute the already large lists of CMake Domain objects.
* | | | | | | 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 'add-CMAKE_FIND_NO_INSTALL_PREFIX'Brad King2013-11-0114-9/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe057ab Allow disabling adding the install prefix to the prefix search path.
| * | | | | | | Allow disabling adding the install prefix to the prefix search path.Stephen Kelly2013-10-3114-9/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain scenarios, it is preferable to keep a 'dirty' install prefix than to clear it, and to expect that content will not be found there. Add a CMAKE_FIND_NO_INSTALL_PREFIX variable that can be set to disable searching the install prefix.
* | | | | | | | 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-018-49/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Test foreach/function/macro handling of bracket argumentsBrad King2013-10-307-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bracket arguments recorded in command invocations inside foreach, function, and macro blocks should not have any replacements done when the arguments are replayed later. Teach the RunCMake.Syntax test to cover these cases.
| * | | | | | | | 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-317-2/+125
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fcb97e Tests: Add test for CTEST_USE_LAUNCHERS capture of custom commands 05c7042 Ninja: run custom commands through launcher if available
| * | | | | | | | Tests: Add test for CTEST_USE_LAUNCHERS capture of custom commandsNils Gladitz2013-10-315-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new test detects if custom command failures are detected with launchers.
| * | | | | | | | Ninja: run custom commands through launcher if availableNils Gladitz2013-10-312-2/+43
| | | | | | | | |
* | | | | | | | | Merge topic 'vs-generator-names'Brad King2013-10-3115-93/+208
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29071fe VS: Add version year to generator names
| * | | | | | | | | VS: Add version year to generator namesBrad King2013-10-2815-93/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|_|/ / / / / / |/| | | | | | | |
generated by cgit v0.12 at 2024-11-10 23:19:33 (GMT)