Brad King
fab711a87a
Merge topic 'release-no-old-osx'
...
992c43d2
Tests: Rename OS X nightly release binary test
45fa326b
Utilities/Release: Drop OS X ppc/i386 binary
9cbab63e
Tests: Drop nightly OS X ppc/i386 binary
2015-10-08 10:31:38 -04:00
Kitware Robot
24c97529ca
CMake Nightly Date Stamp
2015-10-08 00:01:05 -04:00
Stephen Kelly
28749903b6
cmState: Internalize the initialization of a snapshot from its parent.
2015-10-07 20:19:42 +02:00
Stephen Kelly
6c02f62f75
Remove now-unused directory setters.
2015-10-07 20:19:42 +02:00
Stephen Kelly
360e4e1db0
Set the current dirs on the snapshot before creating the cmMakefile.
...
The cmMakefile should get a fully prepared snapshot and not clobber its
definitions. It should eventually be able to process list files from any
starting-point snapshot, though that is some refactoring away still.
2015-10-07 20:19:41 +02:00
Stephen Kelly
af71c7b479
cmTarget: Remove Compute method.
2015-10-07 20:17:55 +02:00
Stephen Kelly
dce6581b7b
cmGeneratorTarget: Move computed sources from cmTarget.
2015-10-07 08:37:58 +02:00
Stephen Kelly
7b6dc0fe45
cmGeneratorTarget: Inline GetSourceFiles from cmTarget.
2015-10-07 08:37:58 +02:00
Stephen Kelly
33f87bb1f5
cmGeneratorTarget: Move AddInterfaceEntries method.
...
It will be needed here in a follow-up commit.
2015-10-07 08:37:57 +02:00
Stephen Kelly
da1b0449d9
cmTarget: Remove a conditional for generate-time source addition.
...
It is not really necessary.
2015-10-07 08:37:57 +02:00
Stephen Kelly
fe113f0fd4
cmTarget: Split storage of sources from genexes.
2015-10-07 08:37:57 +02:00
Stephen Kelly
776ff8eb0b
cmTarget: Add Compute API for sources.
...
This method is a refactoring artifact. It will be removed in a
follow-up.
2015-10-07 08:37:57 +02:00
Stephen Kelly
64f73150b8
cmTarget: Add API for generate-time source addition.
...
This method is a refactoring artifact. It will be removed in a
follow-up.
2015-10-07 08:37:57 +02:00
Stephen Kelly
c38e30f68c
cmGeneratorTarget: Add methods for generate-time source addition.
2015-10-07 08:37:57 +02:00
Stephen Kelly
5d3776a7eb
Access sources through cmGeneratorTarget.
2015-10-07 08:37:56 +02:00
Stephen Kelly
7ce0991a7a
GHS: Port API to cmGeneratorTarget.
2015-10-07 08:37:56 +02:00
Kitware Robot
2c4f902336
CMake Nightly Date Stamp
2015-10-07 00:01:07 -04:00
Stephen Kelly
f716460ed8
cmMakefile: Move invokation to initialize snapshot.
2015-10-06 21:46:09 +02:00
Stephen Kelly
156bd2c983
Xcode: Port away from unnecessary CMP0049 compatibility.
...
The input does not need the conversion.
2015-10-06 20:16:21 +02:00
Stephen Kelly
01e666c70e
cmTarget: Join strings conditionally.
2015-10-06 20:16:20 +02:00
Stephen Kelly
bf28b7874b
cmGeneratorTarget: Rename internal member.
...
Leave the old name available for another use.
2015-10-06 20:16:20 +02:00
Stephen Kelly
9d653f9c1c
cmFLTKWrapUI: Remove CMake 2.2 compat code.
...
CMake 3.0 dropped CMake <= 2.4 compatibility.
2015-10-06 20:16:20 +02:00
Brad King
b520b1ca4e
Tests: Add a nightly Linux 64-bit binary
2015-10-06 13:58:45 -04:00
Brad King
26a0b52dfe
Tests: Rename Linux nightly release binary test to Linux32
...
Distinguish the name from a future 64-bit nightly binary.
2015-10-06 13:56:19 -04:00
Wayne Stambaugh
1bf66fed67
FindOpenSSL: Search for unix-named libraries first on MinGW ( #15765 )
...
Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find
cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds
hosted on Windows too. When building for MinGW, consider library names
that come with MinGW before looking for the main Windows distribution of
OpenSSL.
2015-10-06 11:55:46 -04:00
Wayne Stambaugh
6b575dec8d
FindOpenSSL: Tolerate tabs in header while parsing version ( #15765 )
...
Tolerate tabs instead of spaces in the "# define" line.
2015-10-06 11:50:32 -04:00
Brad King
256bf8876a
Merge topic 'cmGeneratorTarget-exports'
...
d945b36a
cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.
48f8b6ac
cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.
2015-10-06 10:59:13 -04:00
Brad King
5d315f3223
Merge topic 'FindOpenSSL-msvc-static-rt'
...
821e1778
FindOpenSSL: Add support for static MSVC runtime
2015-10-06 10:59:08 -04:00
Brad King
53d90de3d9
Merge topic 'clean-up-cmLocalGenerator'
...
74d565e0
Remove unused cmLocalGenerator include.
09466690
Add cmOutputConverter include where needed.
0a730445
cmake: Remove needless cmLocalGenerator creation.
3339a750
CTest: Port away from cmLocalGenerator.
6da4cd8f
CTest: Remove needless cmLocalGenerator creation.
94cc4e74
CPack: Remove needless cmLocalGenerator creation.
2015-10-06 10:59:06 -04:00
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