Christoph Grüninger
1a9ba38174
cmParseDelphiCoverage: Remove superfluous semicolons after methods
2014-12-23 09:05:11 -05:00
Brad King
99f682b0fd
Merge branch 'release'
2014-12-23 08:56:29 -05:00
Brad King
cca8c3bb60
Merge topic 'doc-octothorpe-escaping'
...
8d70a914
Help: Add 3.1 release note about '#' escaping in Makefiles (#15322 )
2014-12-23 08:54:01 -05:00
Brad King
90b015a0ba
Merge topic 'ninja-fix-crash-on-error'
...
9a13fcbf
Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325 )
2014-12-23 08:53:59 -05:00
Brad King
23e9bc55f3
Merge topic 'base64-constref'
...
82fbf490
cmCTestTestHandler: take reference to temporary string instead of doing a copy
2014-12-23 08:53:56 -05:00
Brad King
3b3da0d39e
Merge topic 'CPackComponent-docs-fix'
...
64016393
Help: Small fixes in CPackComponent documentation
2014-12-23 08:53:54 -05:00
Brad King
396a008ff0
Merge topic 'AppleClang-5.1-features'
...
bb83cdaa
Help: Add notes for topic 'AppleClang-5.1-features'
bd6b42c1
Features: Record for AppleClang 5.1
b341799e
Tests: Fix RunCMake.CompileFeatures test NonValidTarget2 case
2014-12-23 08:53:52 -05:00
Brad King
656af73bca
Merge topic 'cleanup-ExpandListArgument-usage'
...
e2a489c7
Remove some temporary vectors for ExpandListArgument.
0f99feec
cmGeneratorExpression: Remove unused header.
722f1a71
CTest: Expand a string directly into a container.
2014-12-23 08:53:50 -05:00
Brad King
a19a43a930
Merge topic 'ctest-coverage-extra-line-error'
...
9c4984b4
ctest_coverage: Fix error message to report the file name
2014-12-23 08:53:48 -05:00
Brad King
400af305ef
Merge topic 'add-FindGSL'
...
1b28e3b2
FindGSL: Add module to find the GNU Scientific Library
2014-12-23 08:53:45 -05:00
Brad King
bb83cdaab6
Help: Add notes for topic 'AppleClang-5.1-features'
2014-12-23 08:42:01 -05:00
Brad King
8d70a91489
Help: Add 3.1 release note about '#' escaping in Makefiles ( #15322 )
...
The change in commit v3.1.0-rc1~174^2 (Makefile: Handle '#' in
COMPILE_OPTIONS, 2014-08-12) was not compatible with code that
tries to workaround the original bug. Unfortunately there is no
good way to fix the bug in a compatible way. Add a release note
to call attention to the change.
2014-12-23 08:27:05 -05:00
Kitware Robot
7a2d1cd6d4
CMake Nightly Date Stamp
2014-12-23 00:01:15 -05:00
Brad King
62b1998403
Merge branch 'ninja-fix-crash-on-error' into release
2014-12-22 20:00:07 -05:00
Brad King
9a13fcbf02
Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty ( #15325 )
2014-12-22 18:36:07 -05:00
Rolf Eike Beer
82fbf490b5
cmCTestTestHandler: take reference to temporary string instead of doing a copy
...
This will increase the lifetime of the temporary until the end of the function.
2014-12-22 21:38:59 +01:00
Brad King
6697765230
Merge topic 'backport-suncc-fixes'
...
107dcac3
Fix compilation with the Oracle / Sun compiler (#15318 )
2014-12-22 14:26:10 -05:00
Brad King
d62733b48a
Merge branch 'CPackComponent-docs-fix' into release
2014-12-22 14:13:01 -05:00
Brad King
6c39bc5520
Merge topic 'macho-parser'
...
c294a115
Mach-O: Use Mach-O parser to extract install names instead of otool.
e42da307
Mach-O: Add Mach-O parser for OS X and iOS.
2014-12-22 13:41:03 -05:00
Clinton Stimpson
c294a115f2
Mach-O: Use Mach-O parser to extract install names instead of otool.
...
This has much better performance than calling "otool" or "xcrun -r otool"
to extract install names for rpath support.
Fixes bug #15178 .
2014-12-22 11:33:00 -07:00
Clinton Stimpson
e42da30782
Mach-O: Add Mach-O parser for OS X and iOS.
...
This parser also supports fat binaries which archive multiple
Mach-O binaries.
2014-12-22 11:32:10 -07:00
Daniele E. Domenichelli
6401639310
Help: Small fixes in CPackComponent documentation
2014-12-22 17:23:46 +01:00
Stephen Kelly
bd6b42c186
Features: Record for AppleClang 5.1
...
Apple's Clang 5.1 already supports most of the C and C++ features CMake
enumerates.
2014-12-22 10:44:41 -05:00
Brad King
b341799e53
Tests: Fix RunCMake.CompileFeatures test NonValidTarget2 case
...
Mark the generated source file with the GENERATED property explicitly
since it is not marked automatically as the output of any custom
command. Mark both the 0 and 1 variants so it works no matter the
outcome of the generator expression.
2014-12-22 10:36:35 -05:00
Brad King
99ca7a0391
Merge branch 'release'
2014-12-22 10:00:57 -05:00
Brad King
9755fd0e6c
Merge branch 'backport-suncc-fixes' into release
2014-12-22 10:00:03 -05:00
Brad King
90f5845e72
Merge branch 'doc-mingw-makefiles' into release
2014-12-22 09:59:57 -05:00
Brad King
594db49e56
Merge topic 'doc-mingw-makefiles'
...
844f98c1
Help: Clarify MinGW v. MSYS Makefiles generators (#15319 )
2014-12-22 09:59:11 -05:00
Brad King
d760c3cbe8
Merge topic 'nightly-binary-updates'
...
202056cd
Utilities/Release: Build Windows and OS X binaries with native SSL
d64caa53
Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
2014-12-22 09:59:09 -05:00
Vladislav Vinogradov
9c4984b4e5
ctest_coverage: Fix error message to report the file name
...
Print file name instead of line content for "Looks like there are more
lines in the file:" error message.
2014-12-22 09:25:24 -05:00
Brad King
202056cdb8
Utilities/Release: Build Windows and OS X binaries with native SSL
...
For the nightly binaries, turn of CMAKE_USE_OPENSSL on Windows and OS X
10.6+ platforms. This will activate the new curl behavior to use the
OS-native SSL/TLS implementation.
2014-12-22 08:47:46 -05:00
Brad King
d64caa5372
Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
...
In commit v3.1.0-rc1~52^2 (Make the OSX 10.6+ release x86_64 only,
2014-09-29) we forgot to remove the name "universal" from the binary
name. Since the binary is no longer universal, use "x86_64" instead.
While at it, update the deployment target to actually be 10.6.
2014-12-22 08:47:19 -05:00
Kitware Robot
d63609ed2a
CMake Nightly Date Stamp
2014-12-22 00:01:08 -05:00
Kitware Robot
2c76f6f4da
CMake Nightly Date Stamp
2014-12-21 00:01:07 -05:00
Kitware Robot
5bb0ae03ef
CMake Nightly Date Stamp
2014-12-20 00:01:09 -05:00
Brad King
844f98c1fd
Help: Clarify MinGW v. MSYS Makefiles generators ( #15319 )
...
Explain the usage of each generator more clearly and reference each as
an alternative to the other.
Suggested-by: Craig Hicks <hicks111@hotmail.com>
2014-12-19 09:07:25 -05:00
Brad King
852242b60d
Merge topic 'bootstrap-solaris'
...
44c6db6e
bootstrap: Fix syntax for Solaris 10 shell (#15317 )
2014-12-19 08:27:01 -05:00
Brad King
bf731becfa
Merge topic 'update-kwsys'
...
2e9acb6d
Merge branch 'upstream-kwsys' into update-kwsys
1f7de543
KWSys 2014-12-18 (87c65319)
2014-12-19 08:26:59 -05:00
Brad King
ccd5822a83
Merge topic 'osx-cfbundle-tweaks'
...
b189c599
Tests: Run CFBundleTest only with valid configuration
3a605693
Xcode: Call IsCFBundleOnApple to decide if bundle is being built
207b7af0
cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
2014-12-19 08:26:57 -05:00
Brad King
1ac8523c3b
Merge topic 'install-EXPORT-absolute-prefix'
...
dd089e08
install: Allow absolute EXPORT destination with relative targets (#15258 )
2014-12-19 08:26:55 -05:00
Brad King
b189c5994d
Tests: Run CFBundleTest only with valid configuration
...
The verification script needs to know the configuration tested.
2014-12-19 08:24:04 -05:00
Kitware Robot
d48ccbe458
CMake Nightly Date Stamp
2014-12-19 00:01:09 -05:00
Stephen Kelly
e2a489c76a
Remove some temporary vectors for ExpandListArgument.
...
Expand directly into the target when possible.
2014-12-19 00:06:00 +01:00
Stephen Kelly
0f99feec04
cmGeneratorExpression: Remove unused header.
2014-12-19 00:06:00 +01:00
Stephen Kelly
722f1a71e3
CTest: Expand a string directly into a container.
...
Change the follow-up loop to use a const_iterator to log the
content.
2014-12-19 00:05:57 +01:00
Chuck Atkins
107dcac3e0
Fix compilation with the Oracle / Sun compiler ( #15318 )
...
One piece of code has some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
Make it more explicit.
2014-12-18 11:23:41 -05:00
Brad King
cbbe840e96
Merge branch 'bootstrap-solaris' into release
2014-12-18 11:10:09 -05:00
Brad King
44c6db6eb1
bootstrap: Fix syntax for Solaris 10 shell ( #15317 )
...
In commit v3.1.0-rc2~7^2 (Workaround for short jump tables on PA-RISC,
2014-11-04) we added use of shell syntax not supported on the Solaris
shell. Avoid using the '!' operator.
Reported-by: Friedrich Haubensak <hsk@imb-jena.de>
2014-12-18 11:08:55 -05:00
Brad King
2e9acb6d43
Merge branch 'upstream-kwsys' into update-kwsys
2014-12-18 10:17:20 -05:00
KWSys Robot
1f7de54346
KWSys 2014-12-18 (87c65319)
...
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 87c65319 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' cc4046a8..87c65319
Sean McBride (1):
87c65319 SharedForward: Suppress clang -Wcast-qual warnings with conditional pragma
Change-Id: I2f79780385aca7e0caa24e5bb0c0b4106b786c37
2014-12-18 10:17:16 -05:00