Brad King
242d664f74
Merge topic 'xcode-adjust-deployment-to-host-version'
...
24aafbde Xcode: Adjust deployment target SDK version to host version
2015-10-13 13:50:54 -04:00
Kitware Robot
3d9cf05d2a
CMake Nightly Date Stamp
2015-10-13 00:01:06 -04:00
Gregor Jasny
24aafbde11
Xcode: Adjust deployment target SDK version to host version
...
If the automatically selected SDK is newer than the host OS version
and no deployment version has been set then adjust the deployment
version to the host OS version. Otherwise the user won't be able to
launch the executables on the build host.
This is for example a problem on a MacOSX 10.10 host with Xcode 7
which only provides a MacOSX10.11 SDK.
2015-10-12 15:31:10 -04:00
Brad King
e5fb30fb5b
Merge branch 'release'
2015-10-12 10:31:37 -04:00
Brad King
e6b35abf5b
Merge topic 'ctest-submit-content-type'
...
2a6e0b61 CTest: Set Content-Type header for http file upload (#15774 )
2015-10-12 10:31:00 -04:00
Brad King
8f3ea27055
Merge branch 'cpack-wix-typos' into release
2015-10-12 10:30:16 -04:00
Brad King
1ee948d418
Merge branch 'emacs-mode-fix-accidental-indentation' into release
2015-10-12 10:29:56 -04:00
Brad King
e33fe7910f
Merge branch 'doc-clarify-shared-lib' into release
2015-10-12 10:29:44 -04:00
Brad King
4df5c3d131
Merge branch 'revert-compiler-features-solaris' into release
2015-10-12 10:29:36 -04:00
Brad King
889d90de44
Merge branch 'ctest-submit-content-type' into release
2015-10-12 10:29:27 -04:00
Brad King
aad0e62060
Merge topic 'use-generator-target'
...
1c1c2a12 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
c66084f5 cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
83c29e39 cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
19882554 cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
c1f687b1 cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
a6e1f05c cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
654002fe cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
922c8901 cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
eaa5b9cb cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
f539da12 cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
1c5d70f9 cmGeneratorTarget: Port processILibs away from cmTarget.
064c2488 cmComputeLinkDepends: Port some API to cmGeneratorTarget.
3e428fdc cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
110fd2fb cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
e7391699 cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
c5718217 cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
...
2015-10-12 10:26:20 -04:00
Brad King
83d2b6f378
Merge topic 'refactor-cache-manager'
...
79a309d7 cmState: Port away from cmake instance.
e2eecae2 cmState: Move ParseCacheEntry from cmCacheManager.
b5212c68 cmState: Add API for cache version.
95b0d761 cmState: Externalize logic to caller.
6f02034e cmState: Make AddCacheEntry method private.
435a2f3c cmCacheManager: Port away from cmake instance.
062ed22e cmState: Add cache file manipulation wrappers.
a02e53eb Inline unary LoadCache.
bec3487f cmCacheManager: Remove cmMakefile dependency.
e0f740f1 Always cache entries through the cmake instance.
2afadb0d cmake: Port away from trivial cmCacheManager use.
3d8c299f cmake: Use existing cache API wrapper.
2015-10-12 10:26:18 -04:00
Brad King
762108f3ec
Merge topic 'add-cmLocalGenerator-API'
...
223d0efe Remove some needless GetMakefile() calls.
a367416c cmLocalGenerator: Add current source directory accessor.
bbef3c2d cmLocalGenerator: Add current binary directory accessor.
12cb3bdc cmLocalGenerator: Add Home directory accessors.
72efa15d Eclipse: Port API to cmLocalGenerator.
f2a641d6 Kate: Remove unused variables.
10cf42f5 Kate: Port API to cmLocalGenerator.
e46ef270 export: Port internal method to cmGeneratorTarget.
53d3a1c9 cmMakefile: Remove unused GetProjectName calls.
4ab2750c cmLocalGenerator: Add GetProjectName method.
c8187f41 cmCPluginAPI: Inline code to get project name.
8c6e6dd3 cmMakefile: Inline initialization of project name.
27916f2c cmLocalGenerator: Add cmake instance accessor.
2015-10-12 10:26:15 -04:00
Brad King
f3fa7c6bc3
Merge topic 'minor-cleanups'
...
096f0988 cmComputeLinkDepends: Remove unused typedef.
ee44be22 cmGeneratorTarget: Use local GetProperty method.
4f767afe cmMakefile: Remove unneeded container clears.
c72d276a C::B: Remove unused variables.
c99b6cef cmLocalGenerator: Devirtualize method.
2015-10-12 10:26:13 -04:00
Brad King
5dba212f3a
Merge topic 'emacs-mode-unscreamify-more'
...
47f4b3b6 cmake-mode.el: unscreamify symbols instead of words
2015-10-12 10:26:11 -04:00
Brad King
3f7f4e1d2e
Merge topic 'emacs-mode-fix-accidental-indentation'
...
a935745d cmake-mode.el: treat keywords as symbols
2015-10-12 10:26:09 -04:00
Brad King
2f2baf09fd
Merge topic 'cpack-wix-typos'
...
fb9ec243 CPackWIX: fix typos in documentation
2015-10-12 10:26:07 -04:00
Brad King
b6dcf6815b
Merge topic 'doc-clarify-shared-lib'
...
6556481e Help: Document that SHARED libraries must export a symbol (#15775 )
2015-10-12 10:26:05 -04:00
Brad King
1a0da7d320
Merge topic 'osx-file-times-ns-precision'
...
8d27b407 cmFileTimeComparison: Port to OS X nanosecond times (#15769 )
2015-10-12 10:26:03 -04:00
Brad King
859bd8d0c6
Merge topic 'update-kwsys'
...
0faccb83 bootstrap: Drop unnecessary KWSys platform check
265fb0cd cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM
8083285d Merge branch 'upstream-kwsys' into update-kwsys
13c22d28 KWSys 2015-10-06 (ed82989c)
2015-10-12 10:26:01 -04:00
Brad King
9b05b14fef
Merge topic 'revert-compiler-features-solaris'
...
340d0897 Revert topic 'compiler-features-solaris'
2015-10-12 10:25:59 -04:00
Brad King
887b4c8801
Merge topic 'FindGTK2_sigc++_c++11'
...
3d9e3d7b FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
2015-10-12 10:25:56 -04:00
Derek Bruening
2a6e0b611b
CTest: Set Content-Type header for http file upload ( #15774 )
...
Sets the Content-Type header for http file uploads to avoid running afoul
of ModSecurity rules on the server.
2015-10-12 10:17:04 -04:00
Daniele E. Domenichelli
3d9e3d7b79
FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
...
Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
sigc++. The GTK2::sigc++ imported target will automatically enable the
required build flags in order to build with the version found on the
system.
2015-10-12 10:06:55 -04:00
Kitware Robot
70764ead1a
CMake Nightly Date Stamp
2015-10-12 00:01:05 -04:00
Kitware Robot
b46b88e075
CMake Nightly Date Stamp
2015-10-11 00:01:06 -04:00
Stephen Kelly
1c1c2a1201
cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
2015-10-10 17:06:56 +02:00
Stephen Kelly
79a309d786
cmState: Port away from cmake instance.
2015-10-10 15:42:02 +02:00
Stephen Kelly
e2eecae205
cmState: Move ParseCacheEntry from cmCacheManager.
2015-10-10 15:36:59 +02:00
Stephen Kelly
b5212c68de
cmState: Add API for cache version.
2015-10-10 15:36:58 +02:00
Stephen Kelly
95b0d761a7
cmState: Externalize logic to caller.
2015-10-10 15:36:58 +02:00
Stephen Kelly
6f02034e66
cmState: Make AddCacheEntry method private.
2015-10-10 15:36:58 +02:00
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