summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPackWiX: Add variables for custom tool extensions and flagsNils Gladitz2013-11-123-7/+96
|
* CMake Nightly Date StampKitware Robot2013-11-101-1/+1
|
* CMake Nightly Date StampKitware Robot2013-11-091-1/+1
|
* Merge topic 'test-LINK_ONLY-expression'Brad King2013-11-084-5/+17
|\ | | | | | | | | 53b10fd Genex: Add a test for the LINK_ONLY expression.
| * Genex: Add a test for the LINK_ONLY expression.Stephen Kelly2013-11-064-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 239b0c6b (Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES., 2013-10-20) extended a test which excercised the logic of the LINK_ONLY generator expression. Commit ef10b87c (CMP0022: Plain target_link_libraries must populate link interface, 2013-11-02) removed the instance of LINK_ONLY which was excercised by that test. Add a new test which excercises the other instance of LINK_ONLY by setting the CMP0022 policy to NEW and consuming the contents of the INTERFACE_LINK_LIBRARIES target property.
* | Merge topic 'tll-target-policies'Brad King2013-11-0846-7/+437
|\ \ | | | | | | | | | | | | | | | | | | 596b2a8 Disallow linking to utility targets (#13902). 301bb5c Disallow link-to-self (#13947). 05f5fde Disallow invalid target names (#13140)
| * | Disallow linking to utility targets (#13902).Stephen Kelly2013-11-0717-0/+106
| | |
| * | Disallow link-to-self (#13947).Stephen Kelly2013-11-0718-7/+105
| | |
| * | Disallow invalid target names (#13140)Stephen Kelly2013-11-0719-0/+226
| | | | | | | | | | | | | | | Exclude Borland and NMake from the CMP0037 test. They do not accept the colon in a target name.
* | | Merge topic 'doc-cmake-language'Brad King2013-11-083-2/+474
|\ \ \ | | | | | | | | | | | | | | | | | | | | 79fd233 Help: Reference cmake-language.7 comment docs from cmake-developer.7 a931ee4 Help: Add cmake-language.7 manual
| * | | Help: Reference cmake-language.7 comment docs from cmake-developer.7Brad King2013-11-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The cmake-language.7 manual now documents comment syntax. Reference it from cmake-developer.7 when discussing how to add comment-enclosed documentation to modules.
| * | | Help: Add cmake-language.7 manualBrad King2013-11-082-0/+471
| | | |
* | | | Merge topic 'doc-execute_process'Brad King2013-11-081-26/+53
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | 3bb6266 Help: Clarify execute_process COMMAND argument behavior ea6b656 Help: Format execute_process command documentation
| * | | Help: Clarify execute_process COMMAND argument behaviorBrad King2013-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State in the execute_process how COMMAND arguments are passed to the child. Add a note at the end about how the command differs from add_custom_*(). Suggested-by: Alan W. Irwin
| * | | Help: Format execute_process command documentationBrad King2013-11-071-26/+39
| | | | | | | | | | | | | | | | | | | | Use a code-block for the signature. Format the options as a definition list.
* | | | CMake Nightly Date StampKitware Robot2013-11-081-1/+1
|/ / /
* | | Merge topic 'cfbundle-test-no-cl-tools'Brad King2013-11-071-1/+7
|\ \ \ | | | | | | | | | | | | | | | | a5aadcd CFBundle test: Add isysroot argument when calling Rez.
| * | | CFBundle test: Add isysroot argument when calling Rez.Clinton Stimpson2013-11-061-1/+7
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-11-071-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2013-11-061-0/+26
|\ \ \
| * | | CMake 2.8.12.1v2.8.12.1Brad King2013-11-052-1/+27
| | | |
| * | | Merge branch 'fix-automoc-compile-definitions' into releaseBrad King2013-11-053-5/+25
| |\ \ \
| * \ \ \ Merge branch 'cmake-E-automoc-crash' into releaseBrad King2013-11-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'clear-evaluation-files' into releaseBrad King2013-11-041-0/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'policy-CMP0022-fixes' into releaseBrad King2013-11-0426-126/+293
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'object-library-no-TARGET_FILE' into releaseBrad King2013-11-026-1/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'object-library-missing-source' into releaseBrad King2013-11-025-0/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'vs12-parallel-cl-FS' into releaseBrad King2013-11-023-1/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'FindCUDA-NPP-5.5' into releaseBrad King2013-11-021-1/+16
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'doc-html-page-layout'Brad King2013-11-065-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a023a26 Help: Configure html favicon fb33219 Help: Configure html page navigation bars e1f8196 Help: Configure |version| replacement correctly edc7cc9 Help: Configure copyright year automatically
| * | | | | | | | | | | Help: Configure html faviconBrad King2013-11-052-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Help: Configure html page navigation barsBrad King2013-11-053-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a small CMake logo to the left side of the header and footer navigation bars. Set the html theme, title, and short title explicitly.
| * | | | | | | | | | | Help: Configure |version| replacement correctlyBrad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix our configuration of the Sphinx conf.py 'version' entry to refer to the correctly-spelled CMake_VERSION_(MAJOR|MINOR|PATCH) variables.
| * | | | | | | | | | | Help: Configure copyright year automaticallyBrad King2013-11-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach our Sphinx conf.py to compute the copyright end year automatically. Drop our hard-coded configuration for it.
* | | | | | | | | | | | Merge topic 'refactor-autogen-setup'Brad King2013-11-064-89/+114
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 944277d cmAutogen: Gather tool arguments after creating generator targets. d2f4b1e cmAutogen: Rename method to InitializeAutogenTarget 45735f3 cmAutogen: Move autogen target creation to InitializeMocSourceFile. 20a234d cmAutogen: Extract some helper methods for autogen targets.
| * | | | | | | | | | | | cmAutogen: Gather tool arguments after creating generator targets.Stephen Kelly2013-11-052-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change causes the GetLinkInterfaceDependentStringProperty method, called in SetupAutoGenerateTarget, after the creation of generator targets. In CMake 4.0, the GetLinkInterfaceDependentStringProperty will move to the cmGeneratorTarget class, and this patch is a necessary prerequisite to that.
| * | | | | | | | | | | | cmAutogen: Rename method to InitializeAutogenTargetStephen Kelly2013-11-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reflects better what it is doing.
| * | | | | | | | | | | | cmAutogen: Move autogen target creation to InitializeMocSourceFile.Stephen Kelly2013-11-051-67/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SetupAutoGenerateTarget method will soon be invoked at a later time in a followup commit. We need to ensure that we create the utility autogen target early.
| * | | | | | | | | | | | cmAutogen: Extract some helper methods for autogen targets.Stephen Kelly2013-11-051-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These snippets will soon be needed from multiple methods.
* | | | | | | | | | | | | Merge topic 'clear-generator-data'Brad King2013-11-062-48/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cf1120 cmGlobalGenerator: Refactor member cleanup between configures
| * | | | | | | | | | | | cmGlobalGenerator: Refactor member cleanup between configuresBrad King2013-11-052-48/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor member cleanup out from cmGlobalGenerator::Configure and the destructor into a dedicated helper to avoid duplication. This fixes clearing of BuildExportSets between configures.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-11-061-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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.