Commit Graph

29891 Commits

Author SHA1 Message Date
Brad King c914d2bda2 Merge topic 'refactor-computation'
616f0311 cmGlobalGenerator: Move path computation to Compute.
9eea0486 cmGlobalGenerator: Do more computation at compute time.
2eca0559 cmGlobalGenerator: De-virtualize Compute().
21f428f4 VisualStudio: Replace Compute override with AddExtraIDETargets override.
a9588e90 VisualStudio10: Initialize the LongestSource at generate time.
4407eee0 cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().
a09c545d Xcode: Extract a AddExtraIDETargets method.
2015-10-06 10:59:00 -04:00
Brad King 9d5bfa53e6 Merge topic 'refactor-qt-autogen'
15c02cf1 QtAutogen: Port API to cmGeneratorTarget.
f7738fd1 cmLocalGenerator: Constify target in API.
b2054e16 QtAutogen: Port global generator to cmGeneratorTarget.
1e757c31 QtAutogen: Use a target type between loops.
5fb73017 QtAutogen: Make some private statics file static.
86f7fc5d QtAutogen: Move SetupAutoRccTarget method.
2aa3f500 QtAutogen: Move MergeRccOptions method.
59b91107 QtAutogen: Move GetRccExecutable method.
7254f645 QtAutogen: Move SetupAutoUicTarget method.
975b7539 QtAutogen: Move GetUicOpts method.
f75ec604 QtAutogen: Move SetupAutoMocTarget method.
f3158e45 QtAutogen: Move GetCompileDefinitionsAndDirectories method.
493b17f8 QtAutogen: Move SetupSourceFiles method.
2015-10-06 10:58:58 -04:00
Stephen Kelly 15c02cf14e QtAutogen: Port API to cmGeneratorTarget. 2015-10-06 10:56:44 -04:00
Brad King d0c3bf65d5 Merge branch 'upstream-kwsys' into update-kwsys 2015-10-06 10:32:55 -04:00
KWSys Robot bca7325213 KWSys 2015-10-06 (d79801bb)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ d79801bb | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 2089567a..d79801bb
Brad King (1):
      e56e3292 Encoding: Support building on Windows with WIN32_LEAN_AND_MEAN

Terrell Russell (1):
      d79801bb SystemTools: Fix spelling of "succeeded" in comments
2015-10-06 10:32:51 -04:00
Terrell Russell 062473842f bootstrap: Fix spelling of "succeeded" 2015-10-06 10:27:00 -04:00
Terrell Russell b6702d40dd Modules: Fix spelling of "succeeded" in check messages
Change "succeded" to "succeeded" everywhere.
2015-10-06 10:26:19 -04:00
Brad King fab35c95cb Utilities/Release: Move cygwin packages to a subdirectory 2015-10-06 10:13:28 -04:00
Tamas Kenez 8bb908b108 Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode 2015-10-06 09:34:28 -04:00
Colin Tracey 3758af12fa CPackNSIS: Add options to set the bitmap for NSIS installer left side
set MUI_WELCOMEFINISHPAGE_BITMAP
set MUI_UNWELCOMEFINISHPAGE_BITMAP
2015-10-06 09:08:37 -04:00
Kitware Robot 3709e950f4 CMake Nightly Date Stamp 2015-10-06 00:01:06 -04:00
Stephen Kelly 74d565e0e9 Remove unused cmLocalGenerator include. 2015-10-05 20:59:56 +02:00
Stephen Kelly 09466690f0 Add cmOutputConverter include where needed. 2015-10-05 20:58:06 +02:00
Stephen Kelly 0a73044579 cmake: Remove needless cmLocalGenerator creation. 2015-10-05 20:52:26 +02:00
Stephen Kelly 3339a7508e CTest: Port away from cmLocalGenerator. 2015-10-05 20:46:59 +02:00
Stephen Kelly 6da4cd8fb9 CTest: Remove needless cmLocalGenerator creation. 2015-10-05 20:46:59 +02:00
Stephen Kelly 94cc4e74ae CPack: Remove needless cmLocalGenerator creation. 2015-10-05 19:59:23 +02:00
Stephen Kelly f7738fd122 cmLocalGenerator: Constify target in API. 2015-10-05 19:22:02 +02:00
Stephen Kelly b2054e1661 QtAutogen: Port global generator to cmGeneratorTarget. 2015-10-05 19:21:59 +02:00
Stephen Kelly 1e757c318b QtAutogen: Use a target type between loops. 2015-10-05 19:21:56 +02:00
Stephen Kelly 5fb730174d QtAutogen: Make some private statics file static. 2015-10-05 19:21:48 +02:00
Brad King 992c43d2ed Tests: Rename OS X nightly release binary test
The "Mac64" build is now the primary and only OS X build, so just name
it "OSX".
2015-10-05 13:09:36 -04:00
Brad King 45fa326b6c Utilities/Release: Drop OS X ppc/i386 binary
Users with OS X 10.5 or below can build from source or use an older
CMake version.
2015-10-05 13:09:04 -04:00
Brad King 9cbab63ee1 Tests: Drop nightly OS X ppc/i386 binary
Users with OS X 10.5 or below can build from source or use an older
CMake version.
2015-10-05 13:09:04 -04:00
Stephen Kelly 86f7fc5d55 QtAutogen: Move SetupAutoRccTarget method. 2015-10-05 18:55:09 +02:00
Stephen Kelly 2aa3f500c4 QtAutogen: Move MergeRccOptions method. 2015-10-05 18:50:47 +02:00
Stephen Kelly 59b91107d1 QtAutogen: Move GetRccExecutable method. 2015-10-05 18:50:00 +02:00
Stephen Kelly 7254f64525 QtAutogen: Move SetupAutoUicTarget method. 2015-10-05 18:48:41 +02:00
Stephen Kelly 975b753997 QtAutogen: Move GetUicOpts method. 2015-10-05 18:47:49 +02:00
Stephen Kelly f75ec6044c QtAutogen: Move SetupAutoMocTarget method. 2015-10-05 18:46:58 +02:00
Stephen Kelly f3158e45b8 QtAutogen: Move GetCompileDefinitionsAndDirectories method. 2015-10-05 18:46:11 +02:00
Stephen Kelly 493b17f8c7 QtAutogen: Move SetupSourceFiles method. 2015-10-05 18:45:21 +02:00
Stephen Kelly 616f03114e cmGlobalGenerator: Move path computation to Compute. 2015-10-05 18:43:18 +02:00
Stephen Kelly 9eea0486bf cmGlobalGenerator: Do more computation at compute time. 2015-10-05 18:43:18 +02:00
Stephen Kelly 2eca055988 cmGlobalGenerator: De-virtualize Compute().
It now implements the NVI pattern.
2015-10-05 18:43:18 +02:00
Stephen Kelly 21f428f4c0 VisualStudio: Replace Compute override with AddExtraIDETargets override. 2015-10-05 18:43:18 +02:00
Stephen Kelly a9588e90bb VisualStudio10: Initialize the LongestSource at generate time.
There is no need to initialize it at compute time.
2015-10-05 18:43:17 +02:00
Stephen Kelly 4407eee013 cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().
Relieve the Xcode generator of having to reimplement Compute().
2015-10-05 18:43:17 +02:00
Stephen Kelly a09c545d3a Xcode: Extract a AddExtraIDETargets method. 2015-10-05 18:43:17 +02:00
Stephen Kelly d945b36a93 cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget. 2015-10-05 18:42:27 +02:00
Stephen Kelly 48f8b6acf3 cmExportFileGenerator: Evaluate genex with cmGeneratorTarget. 2015-10-05 18:42:27 +02:00
Thijs Wenker 821e17785e FindOpenSSL: Add support for static MSVC runtime
Add an OPENSSL_MSVC_STATIC_RT option to switch from the default search
for `/MD` libraries to look for `/MT` libraries instead.
2015-10-05 11:40:09 -04:00
Brad King f2791da132 Merge branch 'release' 2015-10-05 10:34:10 -04:00
Brad King 679a5d2185 Help: Fix version reference in 3.4 release notes
The 3.4 notes cover changes since 3.3, not 3.4.
2015-10-05 10:33:43 -04:00
Brad King 091fbd6964 Begin post-3.4 development 2015-10-05 10:16:03 -04:00
Brad King 7037ead2ba Merge branch 'release' 2015-10-05 10:14:12 -04:00
Brad King 86cc45e3e3 CMake 3.4.0-rc1 version update 2015-10-05 10:11:00 -04:00
Brad King 850dcbf59a Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2015-10-05 10:09:35 -04:00
Brad King 3187de20fd Merge topic 'doc-3.4-relnotes'
19ce56e2 Help: Organize and revise 3.4 release notes
c922aa18 Help: Consolidate 3.4 release notes
2015-10-05 10:08:34 -04:00
Brad King 19ce56e274 Help: Organize and revise 3.4 release notes
Add section headers similar to the 3.3 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2015-10-05 10:05:26 -04:00