kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,403 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

22403 Commits

Author SHA1 Message Date
Brad King 2053e0cd51 Merge topic 'tll-target-policies' 
596b2a8 Disallow linking to utility targets (#13902).
301bb5c Disallow link-to-self (#13947).
05f5fde Disallow invalid target names (#13140)
 2013-11-08 10:33:14 -05:00
Brad King 064e6d3272 Merge topic 'doc-cmake-language' 
79fd233 Help: Reference cmake-language.7 comment docs from cmake-developer.7
a931ee4 Help: Add cmake-language.7 manual
 2013-11-08 10:33:10 -05:00
Brad King 81d6a0055a Merge topic 'doc-execute_process' 
3bb6266 Help: Clarify execute_process COMMAND argument behavior
ea6b656 Help: Format execute_process command documentation
 2013-11-08 10:32:58 -05:00
Brad King 79fd233806 Help: Reference cmake-language.7 comment docs from cmake-developer.7 
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.
 2013-11-08 08:41:49 -05:00
Brad King a931ee4414 Help: Add cmake-language.7 manual 2013-11-08 08:41:46 -05:00
Kitware Robot 4d76bcc817 CMake Nightly Date Stamp 2013-11-08 00:01:19 -05:00
Brad King 3bb6266492 Help: Clarify execute_process COMMAND argument behavior 
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
 2013-11-07 16:42:39 -05:00
Brad King ea6b656f0c Help: Format execute_process command documentation 
Use a code-block for the signature.  Format the options as a definition
list.
 2013-11-07 16:42:04 -05:00
Brad King 9fc158b6d5 Merge topic 'cfbundle-test-no-cl-tools' 
a5aadcd CFBundle test: Add isysroot argument when calling Rez.
 2013-11-07 09:09:15 -05:00
Stephen Kelly 596b2a8c08 Disallow linking to utility targets (#13902). 2013-11-07 11:06:40 +01:00
Stephen Kelly 301bb5cdda Disallow link-to-self (#13947). 2013-11-07 11:06:39 +01:00
Stephen Kelly 05f5fde0eb Disallow invalid target names (#13140) 
Exclude Borland and NMake from the CMP0037 test. They do not accept
the colon in a target name.
 2013-11-07 11:06:39 +01:00
Kitware Robot 8b27dbf4e4 CMake Nightly Date Stamp 2013-11-07 00:01:15 -05:00
Brad King 6f98d7768c Merge branch 'release' 2013-11-06 14:04:49 -05:00
Brad King 7e58ad7f65 Merge topic 'doc-html-page-layout' 
a023a26 Help: Configure html favicon
fb33219 Help: Configure html page navigation bars
e1f8196 Help: Configure |version| replacement correctly
edc7cc9 Help: Configure copyright year automatically
 2013-11-06 09:59:11 -05:00
Clinton Stimpson a5aadcd46d CFBundle test: Add isysroot argument when calling Rez. 2013-11-06 06:42:44 -07:00
Brad King 18985f6c29 Merge topic 'refactor-autogen-setup' 
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.
 2013-11-06 08:39:08 -05:00
Brad King ef3dc6507e Merge topic 'clear-generator-data' 
5cf1120 cmGlobalGenerator: Refactor member cleanup between configures
 2013-11-06 08:39:01 -05:00
Kitware Robot 4d6b88d44b CMake Nightly Date Stamp 2013-11-06 00:01:11 -05:00
Stephen Kelly 944277d09e cmAutogen: Gather tool arguments after creating generator targets. 
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.
 2013-11-05 20:17:34 +01:00
Stephen Kelly d2f4b1e3cf cmAutogen: Rename method to InitializeAutogenTarget 
This reflects better what it is doing.
 2013-11-05 20:17:34 +01:00
Stephen Kelly 45735f3827 cmAutogen: Move autogen target creation to InitializeMocSourceFile. 
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.
 2013-11-05 20:17:32 +01:00
Stephen Kelly 20a234d1b8 cmAutogen: Extract some helper methods for autogen targets. 
These snippets will soon be needed from multiple methods.
 2013-11-05 20:17:30 +01:00
Brad King e313d397cd Merge topic 'fix-automoc-compile-definitions' 
a1b9465 Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)
 2013-11-05 13:32:15 -05:00
Brad King 4abdee6ba3 CMake 2.8.12.1 2013-11-05 12:30:20 -05:00
Brad King 3063011352 Merge branch 'fix-automoc-compile-definitions' into release 2013-11-05 12:06:28 -05:00
Stephen Kelly a1b9465bf8 Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535) 
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.
 2013-11-05 12:00:49 -05:00
Brad King 177f5e51d2 Merge topic 'osx-no-PackageMaker' 
7947981 CPack: Disable OS X PackageMaker by default (#13662)
 2013-11-05 11:42:10 -05:00
Brad King d9600f9880 Merge topic 'test-Assembler-no-g' 
f60797f Tests/Assembler: Drop -g when generating sample assembly source
 2013-11-05 11:42:01 -05:00
Brad King a023a26cad Help: Configure html favicon 2013-11-05 08:59:02 -05:00
Brad King fb332197bf Help: Configure html page navigation bars 
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.
 2013-11-05 08:58:56 -05:00
Brad King 4ab88500ae Merge topic 'cmake-E-autogen-crash' 
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)
 2013-11-05 08:17:10 -05:00
Brad King 93fe461e6c Merge topic 'remove-cmake-i-wizard' 
0fa9aea Help: Drop mention of cmake -i wizard mode
 2013-11-05 08:17:06 -05:00
Brad King 3e2eacb638 Merge topic 'doc-tool-usage' 
d1e8a02 Help: Refine manual/*.1.rst usage summaries
 2013-11-05 08:17:01 -05:00
Brad King 46316a0569 Merge topic 'FindPHP4-no-cache-output' 
a06debc FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)
 2013-11-05 08:16:57 -05:00
Brad King d94416725e Merge topic 'FindJNI-biarch' 
cde56c1 FindJNI: Support biarch installations (#14541)
 2013-11-05 08:16:51 -05:00
Brad King f506a2efbe Merge topic 'ninja-dont-parse-empty-depsflag' 
f212615 Ninja: don't parse empty string
 2013-11-05 08:16:47 -05:00
Brad King 7ccb8fafdb Merge topic 'ninja-deps-intel' 
d439083 Ninja: add depfile support for Intel's compiler
 2013-11-05 08:16:42 -05:00
Brad King 850276d2b4 Merge branch 'cmake-E-automoc-crash' into release 2013-11-05 07:47:36 -05:00
Brad King 132c40a8a8 cmake: Validate -E cmake_autogen argument count (#14545) 
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.
 2013-11-05 07:39:45 -05:00
Brad King cc52b7d5f9 Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crash 2013-11-05 07:38:51 -05:00
Brad King 9ef66f2b0f cmake: Validate -E cmake_automoc argument count (#14545) 
Do not access an argument index not known to exist.
 2013-11-05 07:37:23 -05:00
Brad King 5cf1120fbf cmGlobalGenerator: Refactor member cleanup between configures 
Factor member cleanup out from cmGlobalGenerator::Configure and the
destructor into a dedicated helper to avoid duplication.  This fixes
clearing of BuildExportSets between configures.
 2013-11-05 07:27:42 -05:00
Brad King 47694c40e3 Merge topic 'clear-evaluation-files' 
2e388cc file(GENERATE): Clear internal records between configures
 2013-11-05 07:26:46 -05:00
Kitware Robot f6f7531353 CMake Nightly Date Stamp 2013-11-05 00:01:07 -05:00
Brad King b84854676b Merge branch 'clear-evaluation-files' into release 2013-11-04 16:35:30 -05:00
Brad King 2e388cc3c2 file(GENERATE): Clear internal records between configures 
In the CMake interactive dialogs cmGlobalGenerator::Configure may
run more than once.  Clear the cmGlobalGenerator::EvaluationFiles
data between configures to avoid accessing deleted data.
 2013-11-04 16:14:49 -05:00
Brad King e1f819664b Help: Configure |version| replacement correctly 
Fix our configuration of the Sphinx conf.py 'version' entry to refer
to the correctly-spelled CMake_VERSION_(MAJOR|MINOR|PATCH) variables.
 2013-11-04 14:22:27 -05:00
Brad King edc7cc967d Help: Configure copyright year automatically 
Teach our Sphinx conf.py to compute the copyright end year
automatically.  Drop our hard-coded configuration for it.
 2013-11-04 14:22:23 -05:00
Brad King 0fa9aea293 Help: Drop mention of cmake -i wizard mode 
The parent commit removed support for this mode, so do not mention
it in the documentation.
 2013-11-04 11:16:22 -05:00