Brad King
4e61edc457
Merge topic 'test-CheckSourceTree-update'
...
2a3e2631
Tests: Fix CheckSourceTree test for newer Git
2014-12-17 14:44:17 -05:00
Brad King
bd62c52115
Merge topic 'doc-custom-command-depends'
...
953d34fd
Help: Document MAIN_DEPENDENCY limitation in add_custom_command
9859042c
Help: Mention add_dependencies in add_custom_target DEPENDS option
2014-12-17 14:44:15 -05:00
Brad King
1dc6f6f8a1
Merge branch 'release'
2014-12-17 14:04:47 -05:00
Sean McBride
d4d2d72f5d
sha2: Fix -Wcast-qual warnings by adding const to some casts
2014-12-17 13:53:04 -05:00
Gregor Jasny
3a605693a5
Xcode: Call IsCFBundleOnApple to decide if bundle is being built
...
Narrow down the decision if a CFBundle is built to one place.
This is a preparation patch to add another target property
which, if set, will imply BUNDLE. Having only one function
which will have to look at both properties helps to keep code
clean.
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2014-12-17 11:26:10 -05:00
Gregor Jasny
207b7af00b
cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
...
Replace duplicated code by call to GetCFBundleDirectory.
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2014-12-17 11:24:02 -05:00
Dmitry Polyanitsa
eeaa25e521
Add 'ANDROID_API_MIN' target property to set Android Target MIN API
...
Also add a 'CMAKE_ANDROID_API_MIN' variable to set the property
default. Teach the VS generator to write the MIN API value into
Nsight Tegra project files.
2014-12-17 11:17:28 -05:00
Kelly Thompson
1b28e3b28b
FindGSL: Add module to find the GNU Scientific Library
2014-12-17 10:59:48 -05:00
Kitware Robot
ddd193fcdd
CMake Nightly Date Stamp
2014-12-17 00:01:08 -05:00
Brad King
2a3e263173
Tests: Fix CheckSourceTree test for newer Git
...
The output of 'git status' no longer starts each line in '#'.
Match that optionally.
2014-12-16 14:51:06 -05:00
Brad King
1c8129795a
ctest_memcheck: Do not open empty BC output file name
...
In cmCTestMemCheckHandler::PostProcessBoundsCheckerTest return early
if the output file name is empty. We already do this in the similar
cmCTestMemCheckHandler::AppendMemTesterOutput method.
2014-12-16 13:49:38 -05:00
Brad King
29533380ea
Tests: Allow RunCMake expected result code to be a regex
...
This will allow the '-result.txt' files to specify a regex matching
different results on different platforms.
2014-12-16 13:34:34 -05:00
Brad King
953d34fd1f
Help: Document MAIN_DEPENDENCY limitation in add_custom_command
...
Specify explicitly that at most one custom command may use a given
source file as its main dependency.
2014-12-16 10:38:43 -05:00
Brad King
9859042c05
Help: Mention add_dependencies in add_custom_target DEPENDS option
...
This will direct readers looking to add target-level dependencies.
2014-12-16 10:38:10 -05:00
Kitware Robot
f30bac5eb4
CMake Nightly Date Stamp
2014-12-16 00:01:09 -05:00
Brad King
a85ee8b8cf
Tests: Simplify RunCMake test extra argument passing
...
Allow add_RunCMake_test calls to pass non-optional arguments
immediately.
2014-12-15 16:46:49 -05:00
Brad King
da7155f5bc
Tests: Allow RunCMake tests to pass generator expressions
2014-12-15 16:46:49 -05:00
Joseph Snyder
0622f92d23
CTest: Remove code to fix scanbuild errors
...
Remove code from cmParseBlanketJSCoverage.cxx and
cmParseDelphiCoverage.cxx which caused scanbuild errors
about not reading the value that was stored.
2014-12-15 12:48:08 -05:00
Brad King
dd089e08b5
install: Allow absolute EXPORT destination with relative targets ( #15258 )
...
When install(EXPORT) is given an absolute destination we cannot compute
the install prefix relative to the installed export file location.
Previously we disallowed installation of targets in such exports with a
relative destination, but did not enforce this for target property
values besides the location of the main target file. This could lead to
broken installations when the EXPORT is installed to an absolute path
but usage requirements are specified relative to the install prefix.
Since an EXPORT installed to an absolute destination cannot be relocated
we can just hard-code the value of CMAKE_INSTALL_PREFIX as the base for
relative paths. This will allow absolute install(EXPORT) destinations
to work with relative destinations for targets and usage requirements.
Extend the ExportImport test with a case covering this behavior.
2014-12-15 11:45:49 -05:00
Brad King
c118816d44
CMake 3.1.0
2014-12-15 11:08:08 -05:00
Brad King
1b3ab3318d
Merge topic 'cmp0054-warnings-extproj'
...
a300d0ff
ExternalProject: avoid CMP0054 warnings
2014-12-15 11:06:57 -05:00
Brad King
b9e0babea9
Merge topic 'extproj-extra-newlines'
...
480e6029
ExternalProject: remove extra newlines from log messages
2014-12-15 11:06:54 -05:00
Brad King
ab09122717
Merge topic 'tests-osx-version'
...
f53a3340
Tests: Fix OS X version check to use component-wise test
2014-12-15 11:06:51 -05:00
Brad King
872ad7a26d
Merge topic 'assert-no-string-conversion'
...
2e92570b
Fix some Clang -Wstring-conversion warnings
2014-12-15 11:06:49 -05:00
Brad King
526c34b240
Merge topic 'curl-winssl'
...
ba8c6632
curl: Use Windows SSL/TLS native implementation
2014-12-15 11:06:47 -05:00
Brad King
6da3f17309
Merge topic 'suncc-fixes'
...
97b65f81
Misc. fixes for the Oracle / Sun compiler.
2014-12-15 11:06:44 -05:00
Brad King
4d2c629045
Merge topic 'FindMPI-parse-Xlinker-flags'
...
a0792c48
FindMPI: Extract -Xlinker options
2014-12-15 11:06:42 -05:00
Kitware Robot
bbabb9d810
CMake Nightly Date Stamp
2014-12-15 00:01:07 -05:00
Kitware Robot
18817e07d6
CMake Nightly Date Stamp
2014-12-14 00:01:08 -05:00
Kitware Robot
fef31f1f21
CMake Nightly Date Stamp
2014-12-13 00:01:30 -05:00
Ben Boeckel
480e60298f
ExternalProject: remove extra newlines from log messages
...
message() already adds a newline.
2014-12-12 18:42:33 -05:00
Ben Boeckel
a300d0ff0f
ExternalProject: avoid CMP0054 warnings
...
Found where ${command} is "make" which is a local variable.
2014-12-12 18:30:00 -05:00
Brad King
f53a3340bb
Tests: Fix OS X version check to use component-wise test
...
Otherwise 10.10 may be considered to be less than 10.4 and the
tests for CPack will not run.
Reported-by: Sean McBride <sean@rogue-research.com>
2014-12-12 15:11:37 -05:00
Sean McBride
2e92570bda
Fix some Clang -Wstring-conversion warnings
...
Some false positives, but some flagged faulty asserts
where the ! was inside the string instead of outside.
2014-12-12 14:38:23 -05:00
Brad King
ba8c663219
curl: Use Windows SSL/TLS native implementation
...
On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation.
This will allow the OS-configured CA list to be trusted automatically.
2014-12-12 13:52:46 -05:00
Brad King
a829f09bdd
Merge branch 'release'
2014-12-12 11:17:55 -05:00
Brad King
3cc84d18d4
Merge topic 'find-msmpi'
...
17a846ac
FindMPI: search for msmpi's mpiexec as well
2014-12-12 11:16:06 -05:00
Brad King
9f41c45f43
Merge topic 'catch-ctest-errors-better'
...
d8589e64
ctest: count errors from scripts properly
2014-12-12 11:16:04 -05:00
Brad King
f6c8d3d82f
Merge topic 'FindQt4-fix-major-version-mismatch'
...
009c1865
FindQt4: Fix handling of QT_VERSION_MAJOR mismatch
2014-12-12 11:16:02 -05:00
Brad King
9c4ef206c7
Merge topic 'drop-double-underscores'
...
111be180
Rename header guards to not start with double underscore
2014-12-12 11:16:00 -05:00
Brad King
ccbdac21df
Merge topic 'doc-CMP0054-example'
...
f2f1c95d
Help: Extend policy CMP0054 documentation with an example
2014-12-12 11:15:59 -05:00
Brad King
0dd9e7173d
Merge branch 'doc-CMP0054-example' into release
2014-12-12 11:13:21 -05:00
Nils Gladitz
f2f1c95dd9
Help: Extend policy CMP0054 documentation with an example
2014-12-12 11:12:46 -05:00
Chuck Atkins
97b65f8156
Misc. fixes for the Oracle / Sun compiler.
...
A few pieces of code have some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
This makes those few instances more explicit.
2014-12-12 10:04:47 -05:00
Alin Marin Elena
a0792c4851
FindMPI: Extract -Xlinker options
...
Extend the regex that mathces -Wl, linker options to match -Xlinker too.
These are used by Intel MPI and perhaps others.
2014-12-12 09:53:43 -05:00
Kitware Robot
17f638a4c9
CMake Nightly Date Stamp
2014-12-12 00:01:09 -05:00
Ben Boeckel
17a846ac3e
FindMPI: search for msmpi's mpiexec as well
2014-12-11 17:26:06 -05:00
Sean McBride
111be1801f
Rename header guards to not start with double underscore
...
Use regex to find/replace:
__(cm.*_h)
\1
Then fix QCMake.h by hand.
2014-12-11 13:53:06 -05:00
Kitware Robot
3171fe0afa
CMake Nightly Date Stamp
2014-12-11 00:01:07 -05:00
Ben Boeckel
d8589e6437
ctest: count errors from scripts properly
...
In the unlikely event that someone has a billion+ scripts (or some
codepath returns negative numbers), we could overflow and make a pile of
errors a non-error. This change also allows us to use flags for the
error in the future rather than just "something went wrong".
2014-12-10 17:22:21 -05:00