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
Calin Cascaval
42ed76bc99
cpack: Fix installed size computation with PackageMaker generator
...
Use the CPACK_PACKAGING_INSTALL_PREFIX when looking for files in a
component. Otherwise we report all packages having size 1.
2014-12-22 09:17:12 -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
Brad King
cd7bde80bf
Merge topic 'update-kwsys'
...
3470704f
Merge branch 'upstream-kwsys' into update-kwsys
6a5ab894
KWSys 2014-12-16 (cc4046a8)
2014-12-18 10:16:42 -05:00
Brad King
45b1e31451
Merge topic 'vs-nsight-tegra-min-api'
...
eeaa25e5
Add 'ANDROID_API_MIN' target property to set Android Target MIN API
2014-12-18 10:16:40 -05:00
Brad King
a39e65a817
Merge topic 'fix-sha2-cast-constness'
...
d4d2d72f
sha2: Fix -Wcast-qual warnings by adding const to some casts
2014-12-18 10:16:38 -05:00
Brad King
e7f26687ab
Merge topic 'doc-INTERFACE-target-type'
...
473446ab
Help: Add INTERFACE_LIBRARY to TYPE target property documentation
2014-12-18 10:16:36 -05:00
Brad King
0549694718
Merge topic 'test-memcheck-with-RunCMake'
...
7ca6bdf0
Tests: Move CTestTestMemcheck tools into Tests/CMakeLib
1651dc96
Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
2014-12-18 10:16:31 -05:00
Brad King
bdf278ad5f
Merge topic 'curl-darwinssl'
...
e4563257
curl: Use OS X SSL/TLS native implementation
2014-12-18 10:16:29 -05:00
Brad King
7ca6bdf035
Tests: Move CTestTestMemcheck tools into Tests/CMakeLib
...
The dummy memcheck tools we build for the RunCMake.CTestMemcheck tests
require CMakeLib, so put them in a Tests/CMakeLib/PseudoMemcheck
directory.
2014-12-18 10:12:16 -05:00
Brad King
1651dc9668
Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
...
The CTestTestMemcheck test cases all try to check the ctest output with
a regular expression. They fail intermittently due to ordering of the
portions of the output that come from stdout and stderr being mixed.
Convert all the test cases to use the RunCMake infrastructure to match
stdout and stderr separately.
2014-12-18 10:12:15 -05:00
Brad King
e4563257ba
curl: Use OS X SSL/TLS native implementation
...
On OS X, when CMAKE_USE_OPENSSL is OFF, use the OS implementation.
This will allow the OS-configured CA list to be trusted automatically.
This is supported on OS X 10.6 and above using AppleClang, Clang, and
GNU compilers.
2014-12-18 09:44:19 -05:00
Kitware Robot
2a45da6ea4
CMake Nightly Date Stamp
2014-12-18 00:01:20 -05:00
Brad King
8af60777e2
Merge branch 'doc-INTERFACE-target-type' into release
2014-12-17 16:05:24 -05:00
Tim Blechmann
473446abfa
Help: Add INTERFACE_LIBRARY to TYPE target property documentation
2014-12-17 16:03:29 -05:00
Brad King
3470704f5a
Merge branch 'upstream-kwsys' into update-kwsys
2014-12-17 15:00:39 -05:00