Commit Graph

26665 Commits

Author SHA1 Message Date
Kitware Robot 05105d5c13 CMake Nightly Date Stamp 2014-12-25 00:01:09 -05:00
Brad King f35febab22 Merge branch 'doc-octothorpe-escaping' into release 2014-12-24 06:41:56 -05:00
Brad King 8afa15fab1 Merge branch 'ninja-fix-subdir-objlib-languages' into release 2014-12-24 06:41:39 -05:00
Brad King 52ee1946b9 Merge topic 'sunpro-Fortran-preprocess'
be1109d8 Oracle/Sun: Fix Fortran preprocessor rule generation
2014-12-24 06:38:39 -05:00
Brad King 2a9f3dc6c7 Merge topic 'minor-warning-fixes'
098fc4a8 cmCMakeMinimumRequired: Use unsigned int for version numbers
1a9ba381 cmParseDelphiCoverage: Remove superfluous semicolons after methods
2014-12-24 06:38:33 -05:00
Brad King 661622f011 Merge topic 'ninja-fix-subdir-objlib-languages'
07fc7b75 Tests: Test using objects from a language enabled in a subdirectory (#15325)
fdbfcfdf Ninja: Generate rules only for languages compiled in a target (#15325)
2014-12-24 06:38:24 -05:00
Brad King c20d3d319c Merge topic 'cpack-PackageMaker-package-size'
42ed76bc cpack: Fix installed size computation with PackageMaker generator
2014-12-24 06:38:08 -05:00
Kitware Robot 279a2bcd65 CMake Nightly Date Stamp 2014-12-24 00:01:10 -05:00
Brad King be1109d811 Oracle/Sun: Fix Fortran preprocessor rule generation
The SunPro Fortran compiler uses "-F" instead of "-E" to request
preprocessing.  The output does not go to stdout so use "-o" to
specify the output file.

This fixes the guess originally made by commit b6b37e30 (Makefile: Add
assembly and preprocessed targets for Fortran, 2014-11-05).
2014-12-23 10:15:27 -05:00
Christoph Grüninger 07a3f9ad17 FindLATEX: Add components handling 2014-12-23 09:11:31 -05:00
Christoph Grüninger 098fc4a862 cmCMakeMinimumRequired: Use unsigned int for version numbers 2014-12-23 09:05:25 -05:00
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 1819d4ad1f Merge branch 'upstream-kwsys' into update-kwsys 2014-12-23 08:47:34 -05:00
KWSys Robot 6ed23ff4e9 KWSys 2014-12-23 (5a15cb3b)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 5a15cb3b | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 87c65319..5a15cb3b
Brad King (1):
      5a15cb3b Base64: Use size_t for lenghts in API

Change-Id: I09a2c5d6b67280f96d580c7b26bf8b2aa0bdb709
2014-12-23 08:47:29 -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 07fc7b75ef Tests: Test using objects from a language enabled in a subdirectory (#15325)
Add a test case that enables CXX in the top level and C in a subdirectory.
Create an executable in the top level that uses C objects compiled in the
subdirectory.  Strictly speaking this is not defined behavior for all
language combinations, but happens to work in this case.  Test this
behavior since projects might try to use it.
2014-12-22 20:13:40 -05:00
Brad King fdbfcfdf01 Ninja: Generate rules only for languages compiled in a target (#15325)
Refactoring in commit v3.1.0-rc1~688^2~2 (cmTarget: Compute languages
from object libraries on demand, 2014-03-18) taught cmTarget::GetLanguages
to (correctly) include the languages of object library sources.  Previously
this was done only in cmTarget::ComputeLinkImplementationLanguages to
choose the linker language.

The Ninja generator writes out generic build rules for each language
compiled within a target using the rule variables defined in the
directory of the target.  This only needs to be done for languages
actually compiled within the current target.  Switch from using the
cmTarget::GetLanguages method to get the list of languages over to
using cmTarget::GetSourceFiles directly so we do not get the languages
in object libraries.

Strictly speaking this should make no difference because it is not safe
to use objects from a language not enabled in the directory containing
a target or else the link information for the language may not be
considered.  However, in cases when no link information happens to be
needed for a language it was possible in CMake 3.0 and below to enable
a language only in a subdirectory providing an object library, and then
use the objects from a containing directory.  The above change teaches
the Ninja generator to continue working in this case.
2014-12-22 20:13:30 -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
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