summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-automoc-compile-definitions'Brad King2013-11-053-5/+25
|\ | | | | | | | | a1b9465 Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)
| * Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)Stephen Kelly2013-11-053-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 18412153 (Refactor cmTarget::GetCompileDefinitions..., 2013-06-06) cmQtAutomoc was refactored to get all compile definitions from the target instead of separately asking the target and querying the directory-level COMPILE_DEFINITIONS property value. While the generation process does integrate directory-level COMPILE_DEFINITIONS into the target definitions, this did not happen until after Automoc targets are constructed. Therefore the commit regressed use of directory-level definitions in Automoc targets. Factor the definition finalization logic out from the cmGlobalGenerator::CreateGeneratorTargets method into a new cmGlobalGenerator::FinalizeTargetCompileDefinitions method and call it before constructing Automoc targets. This will place the directory-level definitions into the target in time to use them for the Automoc targets. Extend the QtAutomoc test to cover this case.
* | Merge topic 'osx-no-PackageMaker'Brad King2013-11-051-1/+1
|\ \ | | | | | | | | | | | | 7947981 CPack: Disable OS X PackageMaker by default (#13662)
| * | CPack: Disable OS X PackageMaker by default (#13662)Brad King2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) PackageMaker was split out of Xcode 4.3 and above into a separate Auxiliary tools package. Since Xcode 5.0 or so, Apple no longer distributes PackageMaker as part of the available development tools so it can only be obtained from old packages. Disable the CPACK_BINARY_PACKAGEMAKER option by default as is the case for most other tool-dependent generators.
* | | Merge topic 'test-Assembler-no-g'Brad King2013-11-051-0/+3
|\ \ \ | | | | | | | | | | | | | | | | f60797f Tests/Assembler: Drop -g when generating sample assembly source
| * | | Tests/Assembler: Drop -g when generating sample assembly sourceBrad King2013-11-011-0/+3
| |/ / | | | | | | | | | | | | | | | Some compilers, such as Clang on OS X, do not want the -g flag for both generating assembly code and assembling it. Drop the -g flag from generation of main.s in the Assembler test.
* | | Merge topic 'cmake-E-autogen-crash'Brad King2013-11-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 132c40a cmake: Validate -E cmake_autogen argument count (#14545) cc52b7d Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crash 9ef66f2 cmake: Validate -E cmake_automoc argument count (#14545)
| * | | cmake: Validate -E cmake_autogen argument count (#14545)Brad King2013-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not access an argument index not known to exist. Port the change from commit 9ef66f2b (cmake: Validate -E cmake_automoc argument count, 2013-11-05) to the new location of the code.
| * | | Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crashBrad King2013-11-050-0/+0
| |\ \ \
| | * | | cmake: Validate -E cmake_automoc argument count (#14545)Brad King2013-11-051-1/+1
| | | |/ | | |/| | | | | | | | | Do not access an argument index not known to exist.
* | | | Merge topic 'remove-cmake-i-wizard'Brad King2013-11-052-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0fa9aea Help: Drop mention of cmake -i wizard mode
| * | | | Help: Drop mention of cmake -i wizard modeBrad King2013-11-042-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The parent commit removed support for this mode, so do not mention it in the documentation.
* | | | | Merge topic 'doc-tool-usage'Brad King2013-11-055-14/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d1e8a02 Help: Refine manual/*.1.rst usage summaries
| * | | | | Help: Refine manual/*.1.rst usage summariesBrad King2013-11-045-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a parsed-literal block to list possible command-line signatures. Add an "Options" section header before the list of options.
* | | | | | Merge topic 'FindPHP4-no-cache-output'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a06debc FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)
| * | | | | | FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)Brad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set() call for this variable left out the CACHE keyword. It does not need to be cached anyway, so drop the other CACHE set() signature arguments. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475 Reported-by: Modestas Vainius <modax@debian.org> Inspired-by: Mathieu Malaterre <malat@debian.org>
* | | | | | | Merge topic 'FindJNI-biarch'Brad King2013-11-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cde56c1 FindJNI: Support biarch installations (#14541)
| * | | | | | | FindJNI: Support biarch installations (#14541)Modestas Vainius2013-11-041-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On biarch architecture, CMAKE_SYSTEM_PROCESSOR might be a 64bit one while the system 32bit one. Take this into consideration while looking for Java library directory. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718290
* | | | | | | Merge topic 'ninja-dont-parse-empty-depsflag'Brad King2013-11-051-5/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f212615 Ninja: don't parse empty string
| * | | | | | | Ninja: don't parse empty stringPeter Kümmel2013-11-041-5/+8
| | | | | | | |
* | | | | | | | Merge topic 'ninja-deps-intel'Brad King2013-11-052-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | d439083 Ninja: add depfile support for Intel's compiler
| * | | | | | | Ninja: add depfile support for Intel's compilerPeter Kümmel2013-11-042-0/+4
| |/ / / / / /
* | | | | | | Merge topic 'clear-evaluation-files'Brad King2013-11-051-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e388cc file(GENERATE): Clear internal records between configures
| * | | | | | | file(GENERATE): Clear internal records between configuresBrad King2013-11-041-0/+8
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the CMake interactive dialogs cmGlobalGenerator::Configure may run more than once. Clear the cmGlobalGenerator::EvaluationFiles data between configures to avoid accessing deleted data.
* | | | | | | CMake Nightly Date StampKitware Robot2013-11-051-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'policy-CMP0022-fixes-for-master'Brad King2013-11-043-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9654c6 Fix INTERFACE_LINK_LIBRARIES documentation typos 23087eb Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-master 603fe92 Fix summary documentation of INTERFACE_LINK_LIBRARIES 0aa97b6 Fix spelling in INTERFACE_LINK_LIBRARIES documentation (#14542)
| * | | | | Fix INTERFACE_LINK_LIBRARIES documentation typosBrad King2013-11-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the changes from commit 603fe925 (Fix summary documentation of INTERFACE_LINK_LIBRARIES, 2013-11-04) and commit 0aa97b6b (Fix spelling in INTERFACE_LINK_LIBRARIES documentation, 2013-11-04) to the new location of the same documentation.
| * | | | | Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-masterBrad King2013-11-040-0/+0
| |\ \ \ \ \ |/ / / / / /
| * | | | | Fix summary documentation of INTERFACE_LINK_LIBRARIESBrad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The property applies to all library types, not just shared libraries.
| * | | | | Fix spelling in INTERFACE_LINK_LIBRARIES documentation (#14542)Modestas Vainius2013-11-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | s/overriden/overridden/
* | | | | | Merge topic 'policy-CMP0022-fixes-for-master'Brad King2013-11-0423-161/+241
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b51696f CMP0022: Update target_link_libraries plain signature documentation 25b7f87 Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-master 0a561a0 CMP0022: Warn about a given target at most once 23d21b7 Do not export INTERFACE_LINK_LIBRARIES from non-linkable targets ef10b87 CMP0022: Plain target_link_libraries must populate link interface 0e06788 CMP0022: Add test for target_link_libraries plain signature c0f4a61 CMP0022: Add unit test for null pointer check and message. 4b0cfa7 Merge branch 'output-CMP0022-entries' into policy-CMP0022-fixes
| * | | | | | CMP0022: Update target_link_libraries plain signature documentationBrad King2013-11-031-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the documentation change made by commit ef10b87c (CMP0022: Plain target_link_libraries must populate link interface, 2013-11-02) in the new location for the same documentation.
| * | | | | | 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 'constify'Brad King2013-11-044-35/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af4c109 cmGeneratorTarget: Make some accessors const. 6bdea06 cmTarget: Make some accessors const.
| * | | | | | | | cmGeneratorTarget: Make some accessors const.Stephen Kelly2013-11-032-21/+22
| | | | | | | | |
| * | | | | | | | cmTarget: Make some accessors const.Stephen Kelly2013-11-032-14/+14
| | | | | | | | |
* | | | | | | | | Merge topic 'doc-CMAKE_INCLUDE_DIRECTORIES_BEFORE'Brad King2013-11-044-1/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12d10a0 Add missing documentation for include dirs related variables. (#12611)
| * | | | | | | | | Add missing documentation for include dirs related variables. (#12611)Stephen Kelly2013-11-024-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document CMAKE_INCLUDE_DIRECTORIES_BEFORE and CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.
* | | | | | | | | | Merge topic 'improve-tgt-INCLUDE_DIRECTORIES-docs'Brad King2013-11-041-5/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c6363a cmTarget: Improve INCLUDE_DIRECTORIES property docs (#13188).
| * | | | | | | | | | cmTarget: Improve INCLUDE_DIRECTORIES property docs (#13188).Stephen Kelly2013-11-021-5/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that relative paths should not be added directly.
* | | | | | | | | | Merge topic 'robust-ctest_empty_binary_directory'Brad King2013-11-044-3/+140
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35fbc10 CTest: more aggressive implementation of ctest_empty_binary_directory() 9d9f102 Tests: added test for ctest_empty_binary_directory()
| * | | | | | | | | | CTest: more aggressive implementation of ctest_empty_binary_directory()Nils Gladitz2013-11-022-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that CMakeCache.txt is the last file being removed since the binary directory may be left in a state that is no longer removable otherwise. Also retry removal a couple of times which makes this more robust on windows where file locks may temporarily prevent removal.
| * | | | | | | | | | Tests: added test for ctest_empty_binary_directory()Nils Gladitz2013-11-012-0/+77
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'cpack-drag-n-drop-rez'Brad King2013-11-044-2/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53d6ebb cpack: For DragNDrop generator, add sysroot option when calling Rez. 193029c cpack: For DragNDrop generator, add sysroot option when calling Rez.
generated by cgit v0.12 at 2024-12-29 10:24:15 (GMT)