Stephen Kelly
435a2f3ccb
cmCacheManager: Port away from cmake instance.
2015-10-10 15:36:58 +02:00
Stephen Kelly
062ed22ec4
cmState: Add cache file manipulation wrappers.
2015-10-10 15:36:58 +02:00
Stephen Kelly
a02e53eb94
Inline unary LoadCache.
2015-10-10 15:36:57 +02:00
Stephen Kelly
bec3487fa9
cmCacheManager: Remove cmMakefile dependency.
...
Update comment.
2015-10-10 15:36:57 +02:00
Stephen Kelly
e0f740f1b1
Always cache entries through the cmake instance.
2015-10-10 15:36:57 +02:00
Stephen Kelly
2afadb0d5a
cmake: Port away from trivial cmCacheManager use.
2015-10-10 15:10:23 +02:00
Stephen Kelly
3d8c299f3e
cmake: Use existing cache API wrapper.
2015-10-10 14:56:44 +02:00
Stephen Kelly
c66084f5d7
cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
2015-10-10 11:22:41 +02:00
Stephen Kelly
83c29e3903
cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
2015-10-10 11:22:27 +02:00
Stephen Kelly
1988255448
cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
2015-10-10 11:22:27 +02:00
Stephen Kelly
c1f687b1ad
cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
2015-10-10 11:22:20 +02:00
Stephen Kelly
a6e1f05c15
cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
2015-10-10 11:21:11 +02:00
Stephen Kelly
654002feb8
cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
2015-10-10 11:21:09 +02:00
Stephen Kelly
922c89014f
cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
2015-10-10 11:20:30 +02:00
Stephen Kelly
eaa5b9cbb1
cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
2015-10-10 11:14:32 +02:00
Stephen Kelly
f539da126b
cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
2015-10-10 11:14:31 +02:00
Stephen Kelly
1c5d70f9c2
cmGeneratorTarget: Port processILibs away from cmTarget.
2015-10-10 11:14:31 +02:00
Stephen Kelly
064c248811
cmComputeLinkDepends: Port some API to cmGeneratorTarget.
2015-10-10 11:14:31 +02:00
Stephen Kelly
223d0efe55
Remove some needless GetMakefile() calls.
2015-10-10 11:04:39 +02:00
Stephen Kelly
a367416cec
cmLocalGenerator: Add current source directory accessor.
2015-10-10 11:04:39 +02:00
Stephen Kelly
bbef3c2da8
cmLocalGenerator: Add current binary directory accessor.
2015-10-10 11:04:39 +02:00
Stephen Kelly
3e428fdcb4
cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
2015-10-10 11:03:48 +02:00
Stephen Kelly
110fd2fba1
cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
2015-10-10 11:03:48 +02:00
Stephen Kelly
e73916992c
cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
2015-10-10 11:03:48 +02:00
Kitware Robot
3fe240a79a
CMake Nightly Date Stamp
2015-10-10 00:01:07 -04:00
Kitware Robot
9f6638c8a7
CMake Nightly Date Stamp
2015-10-09 00:01:08 -04:00
Stephen Kelly
096f098849
cmComputeLinkDepends: Remove unused typedef.
2015-10-09 01:08:31 +02:00
Stephen Kelly
c5718217ad
cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
bf5eb4a3f3
cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
49017cddab
cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
0bae4a416f
cmGeneratorTarget: Move output info from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
1abc20d81d
cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
50dc9b4440
cmGeneratorTarget: Move GetPDBDirectory from cmTarget.
2015-10-09 01:04:37 +02:00
Stephen Kelly
8b0168863e
cmGeneratorTarget: Move GetDirectory from cmTarget.
2015-10-09 01:04:37 +02:00
Stephen Kelly
ee44be22cb
cmGeneratorTarget: Use local GetProperty method.
2015-10-09 00:07:55 +02:00
Stephen Kelly
4f767afe1d
cmMakefile: Remove unneeded container clears.
...
No need to do that in a destructor.
2015-10-09 00:05:14 +02:00
Stephen Kelly
c72d276a5a
C::B: Remove unused variables.
2015-10-09 00:04:50 +02:00
Stephen Kelly
c99b6cefbe
cmLocalGenerator: Devirtualize method.
2015-10-09 00:03:40 +02:00
Stephen Kelly
12cb3bdce4
cmLocalGenerator: Add Home directory accessors.
...
Reduce reasons for cmLocalGenerator to have a cmMakefile.
2015-10-09 00:00:19 +02:00
Stephen Kelly
72efa15dc2
Eclipse: Port API to cmLocalGenerator.
2015-10-09 00:00:19 +02:00
Stephen Kelly
f2a641d68b
Kate: Remove unused variables.
2015-10-09 00:00:19 +02:00
Stephen Kelly
10cf42f5ae
Kate: Port API to cmLocalGenerator.
2015-10-09 00:00:19 +02:00
Stephen Kelly
e46ef270ed
export: Port internal method to cmGeneratorTarget.
2015-10-09 00:00:18 +02:00
Stephen Kelly
53d3a1c95a
cmMakefile: Remove unused GetProjectName calls.
2015-10-09 00:00:18 +02:00
Stephen Kelly
4ab2750c54
cmLocalGenerator: Add GetProjectName method.
2015-10-09 00:00:18 +02:00
Stephen Kelly
c8187f414b
cmCPluginAPI: Inline code to get project name.
2015-10-09 00:00:18 +02:00
Stephen Kelly
8c6e6dd3ce
cmMakefile: Inline initialization of project name.
2015-10-09 00:00:18 +02:00
Stephen Kelly
e0261a1e20
cmTarget: Make OutputInfo definition public.
2015-10-08 23:41:30 +02:00
Stephen Kelly
df42dbb355
cmGeneratorTarget: Move link implementation from cmTarget.
2015-10-08 23:41:29 +02:00
Stephen Kelly
a8429a402d
cmTarget: Split storage of link implementation from backtraces.
2015-10-08 23:41:29 +02:00
Stephen Kelly
370bb92c10
cmGeneratorTarget: Issue messages through the local generator.
2015-10-08 23:41:27 +02:00
Stephen Kelly
27916f2cd1
cmLocalGenerator: Add cmake instance accessor.
2015-10-08 23:25:11 +02:00
Brad King
8d27b40778
cmFileTimeComparison: Port to OS X nanosecond times ( #15769 )
2015-10-08 13:37:37 -04:00
Brad King
265fb0cdc7
cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM
...
The KWSys Configure.hxx header no longer exposes this value.
Take the value from the KWSys try compile result variable instead.
2015-10-08 13:26:44 -04:00
Brad King
8083285d1b
Merge branch 'upstream-kwsys' into update-kwsys
2015-10-08 13:26:08 -04:00
Brad King
750391afc1
Merge topic 'cmGeneratorTarget-sources'
...
af71c7b4
cmTarget: Remove Compute method.
dce6581b
cmGeneratorTarget: Move computed sources from cmTarget.
7b6dc0fe
cmGeneratorTarget: Inline GetSourceFiles from cmTarget.
33f87bb1
cmGeneratorTarget: Move AddInterfaceEntries method.
da1b0449
cmTarget: Remove a conditional for generate-time source addition.
fe113f0f
cmTarget: Split storage of sources from genexes.
776ff8eb
cmTarget: Add Compute API for sources.
64f73150
cmTarget: Add API for generate-time source addition.
c38e30f6
cmGeneratorTarget: Add methods for generate-time source addition.
5d3776a7
Access sources through cmGeneratorTarget.
7ce0991a
GHS: Port API to cmGeneratorTarget.
156bd2c9
Xcode: Port away from unnecessary CMP0049 compatibility.
01e666c7
cmTarget: Join strings conditionally.
bf28b787
cmGeneratorTarget: Rename internal member.
9d653f9c
cmFLTKWrapUI: Remove CMake 2.2 compat code.
2015-10-08 13:08:32 -04:00
Brad King
db266aaade
Merge topic 'refactor-current-dir-initialization'
...
28749903
cmState: Internalize the initialization of a snapshot from its parent.
6c02f62f
Remove now-unused directory setters.
360e4e1d
Set the current dirs on the snapshot before creating the cmMakefile.
f716460e
cmMakefile: Move invokation to initialize snapshot.
2015-10-08 13:08:30 -04:00
Brad King
c997595ea3
Merge topic 'cpack-nsis-bitmap'
...
3758af12
CPackNSIS: Add options to set the bitmap for NSIS installer left side
2015-10-08 10:31:48 -04:00
Brad King
3cf71728a1
Merge topic 'update-kwsys'
...
d0c3bf65
Merge branch 'upstream-kwsys' into update-kwsys
bca73252
KWSys 2015-10-06 (d79801bb)
2015-10-08 10:31:46 -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
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
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
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
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
Brad King
091fbd6964
Begin post-3.4 development
2015-10-05 10:16:03 -04:00
Brad King
86cc45e3e3
CMake 3.4.0-rc1 version update
2015-10-05 10:11:00 -04:00
Brad King
6c25ceb6a8
Merge topic 'vs-win10-store'
...
2402bb8c
Help: Document Windows 10 Universal Applications in cmake-toolchains(7)
1be2f12c
VS: Add support for Windows 10 Universal (Store) Applications
2798dbda
VS: Refactor indentation of LinkLibraryDependencies
8c426183
MSVC: Add system libs for WindowsStore on VS 2015
d1b87d72
VS: Select Windows 10 Store SDK and toolset for VS 2015
2015-10-05 10:04:11 -04:00
Brad King
518dc27728
Merge topic 'vs-win10-sdk'
...
45812111
VS: Select latest Windows 10 SDK if no specific version was requested
2015-10-05 10:04:09 -04:00
Gilles Khouzam
1be2f12cf2
VS: Add support for Windows 10 Universal (Store) Applications
...
Teach the VS 2015 generator to support WindowsStore 10.0 applications.
Add target properties to customize them:
* VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION: Specifies the minimum version
of the OS that the project can target.
* VS_DESKTOP_EXTENSIONS_VERSION, VS_MOBILE_EXTENSIONS_VERSIONS,
VS_IOT_EXTENSIONS_VERSION: Add a reference to the version of the SDK
specified to the target allowing to target the extended functionality in
a universal project.
* VS_IOT_STARTUP_TASK: Specifies that the target should be
built as an IOT continuous background task.
2015-10-05 09:48:11 -04:00
Gilles Khouzam
2798dbdacb
VS: Refactor indentation of LinkLibraryDependencies
...
Use our indentation specifier instead of hard-coding spaces.
2015-10-05 09:24:50 -04:00
Kitware Robot
a57f5abdf6
CMake Nightly Date Stamp
2015-10-05 00:01:04 -04:00
Kitware Robot
fb4e14d281
CMake Nightly Date Stamp
2015-10-04 00:01:04 -04:00
Kitware Robot
7a6c3ff01b
CMake Nightly Date Stamp
2015-10-03 00:01:05 -04:00
Gilles Khouzam
d1b87d72f9
VS: Select Windows 10 Store SDK and toolset for VS 2015
2015-10-02 16:34:11 -04:00
Gilles Khouzam
458121116a
VS: Select latest Windows 10 SDK if no specific version was requested
...
If CMAKE_SYSTEM_VERSION is just "10.0" then use the latest SDK available
since no particular version was requested.
2015-10-02 16:18:44 -04:00
Brad King
d80161b08c
Merge topic 'vs-win10-sdk'
...
3f077996
VS: Add support for selecting the Windows 10 SDK (#15670 )
5dfc4c5f
VS: Add hook to initialize Windows platform settings
61c472a2
cmSystemTools: Add VersionCompareGreater helper
2015-10-02 09:58:17 -04:00
Gilles Khouzam
3f077996f5
VS: Add support for selecting the Windows 10 SDK ( #15670 )
...
Teach the VS 2015 generator to produce a WindowsTargetPlatformVersion
value. Use the CMAKE_SYSTEM_VERSION to specify the version and if not
set choose a default based on available SDKs. Activate this behavior
when targeting Windows 10.
Co-Author: Brad King <brad.king@kitware.com>
2015-10-02 09:53:25 -04:00
Gilles Khouzam
5dfc4c5f50
VS: Add hook to initialize Windows platform settings
...
Give VS 10+ generators a chance to choose Windows platform settings just
as they already can for WindowsCE, WindowsStore, and WindowsPhone.
2015-10-02 09:43:24 -04:00
Gilles Khouzam
61c472a287
cmSystemTools: Add VersionCompareGreater helper
...
Wrap a call to VersionCompare with OP_GREATER in a signature suitable
for use with std::sort.
2015-10-02 09:43:24 -04:00
Kitware Robot
02bc311138
CMake Nightly Date Stamp
2015-10-02 00:01:06 -04:00
Brad King
59202e17ff
Merge topic 'compiler-links-statically'
...
8b4873a1
Disable shared library support when compiler links statically
e90f463a
Drop executable symbol export if platform does not support shared libs
2015-10-01 11:02:38 -04:00
Brad King
5303c187b1
Merge topic 'fix-warnings'
...
f90acf52
cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
e67e0155
cmMakefile: Avoid name conflict with Solaris global typedef
2015-10-01 11:02:34 -04:00
Kitware Robot
ab99010a34
CMake Nightly Date Stamp
2015-10-01 00:01:06 -04:00
Chuck Atkins
e90f463a31
Drop executable symbol export if platform does not support shared libs
...
Instead of always adding CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS to
executables, or just when the ENABLE_EXPORTS property is set (CMP0065),
make sure that the target platform also actually supports shared
libraries. If not, then the executable cannot possibly provide symbols
to them anyway.
2015-09-30 14:59:11 -04:00
Brad King
2cf71cbdf6
Merge topic 'update-kwsys'
...
def90d5f
Merge branch 'upstream-kwsys' into update-kwsys
cc144ebf
KWSys 2015-09-28 (2089567a)
2015-09-30 09:43:37 -04:00
Brad King
f90acf522b
cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
...
Add a 'u' suffix to FILETIME component integer constant initializers.
This avoids warnings about the range of the signed constant value.
2015-09-30 08:53:09 -04:00
Brad King
e67e0155d9
cmMakefile: Avoid name conflict with Solaris global typedef
...
On Solaris there is a global typedef called 'single':
/usr/include/floatingpoint.h:77:15: note: shadowed declaration is here
typedef float single;
Avoid shadowing it by using a different name.
2015-09-30 08:47:02 -04:00
Kitware Robot
11733d2dae
CMake Nightly Date Stamp
2015-09-30 00:01:05 -04:00
Brad King
def90d5fa5
Merge branch 'upstream-kwsys' into update-kwsys
2015-09-29 10:10:03 -04:00
Brad King
f23ab1a150
Merge topic 'vs-old-rule-files'
...
fa5284f0
VS: Prevent generated "rule" files from causing rebuilds
2015-09-29 10:08:15 -04:00
Brad King
130f116340
Merge topic 'fix-qtautogen-with-object-library-Ninja'
...
9bc6eb8e
cmGlobalGenerator: Initialize generator targets on construction (#15729 )
2015-09-29 10:08:13 -04:00
Brad King
ee1b041108
Merge topic 'simplify-qt-autogen'
...
1fe39020
QtAutogen: Port away from cmLocalGenerator.
59a729b2
QtAutogen: Split initializer class into separate file.
1e83a963
QtAutogen: Split initializer methods into separate class.
12f0e13c
QtAutogen: Simplify generator initialization API.
65ff75d3
QtAutogen: Remove unnecessary dereference.
64b78c14
QtAutogen: Move Source initialization to prior loop.
c3c20d3c
QtAutogen: Add _automoc.cpp sources before initializing.
8b6ec29d
QtAutogen: Move initialization condition to caller.
9470b056
QtAutogen: Move condition to prior loop.
b7491b1c
QtAutogen: Move condition to prior loop.
e791c854
QtAutogen: Make some methods static.
6210ec64
QtAutogen: Make internal method private.
a3ceb998
QtAutogen: Don't use members to initialize automoc targets.
dced2fe1
QtAutogen: Rename variable.
f9a77e76
QtAutogen: Don't use a member to store skipped uic files.
c3633e7a
QtAutogen: Add missing includes and forward declarations.
2015-09-29 10:08:10 -04:00
Brad King
6a072563d2
Merge topic 'cpack-package-empty-dirs'
...
9298f56d
CPack: allow packaging of empty directories
ecd71c9c
SystemTools: time operations on directories
19c6f4ee
SystemTools: set time file permissions
749a140a
CPackDeb: allow empty directories in component packages
2015-09-29 10:08:06 -04:00
Brad King
1d11f3ca68
Merge topic 'link-https-cmake.org'
...
da7276cf
Replace http://www.cmake.org URLs with https://cmake.org
2015-09-29 10:08:02 -04:00
Stephen Kelly
9bc6eb8e1f
cmGlobalGenerator: Initialize generator targets on construction ( #15729 )
...
The Ninja generator and Visual Studio generators are special-cased for the
QtAutogen feature. In order to reduce the number of custom targets, the Visual
Studio generators prefer to create custom commands instead, and in order to
create appropriate Ninja files, generated rcc files are listed as byproducts.
This requires the use of the GetConfigCommonSourceFiles API of the
cmGeneratorTarget for those generators when initializing the autogen target.
The initializer method is called from Compute() after the cmGeneratorTarget
objects are created, however the initialization of the object directory occurs
later in the InitGeneratorTargets method. That means that the resulting object
locations are computed incorrectly and cached before the object directory is
determined, so the generated buildsystem can not find the object files.
The initialization of the object directory was split from the creation of
cmGeneratorTarget instances in commit 0e0258c8
(cmGlobalGenerator: Split
creation of generator object from initialization., 2015-07-25). The motivation
for the split was to do only what is essential to do early in cases where
cmGeneratorTargets need to be created at configure-time. That is required for
the purpose of implementing policies CMP0024 and CMP0026, and for
try_compile(LINK_LIBRARIES). However, the split was not really necessary.
Compute the object directory in the cmGeneratorTarget constructor instead.
The QtAutogen unit test already tests the use of TARGET_OBJECTS with AUTOMOC,
and that test already passes on Ninja. The reason it already passes is that
the QtAutogen target also uses the AUTORCC feature, and specifies several qrc
files in its SOURCES. Later in the Compute algorithm (after the
InitGeneratorTargets call), the rcc files are determined and target->AddSource
is called. The AddSource call clears the previously mentioned cache of source
files, causing it to be regenerated when next queried, this time taking account
of the object directory.
Extend the test suite with a new target which does not make use of AUTORCC with
qrc files so that the test added alone would break without the fix in this
commit.
2015-09-29 09:56:34 -04:00
Stephen Kelly
1fe390201d
QtAutogen: Port away from cmLocalGenerator.
2015-09-29 09:56:23 -04:00
Stephen Kelly
59a729b2be
QtAutogen: Split initializer class into separate file.
2015-09-29 09:56:23 -04:00
Kitware Robot
db70fcb110
CMake Nightly Date Stamp
2015-09-29 00:01:06 -04:00
Domen Vrankar
9298f56dce
CPack: allow packaging of empty directories
2015-09-29 01:18:18 +02:00