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
Kitware Robot
a7d8345d8c
CMake Nightly Date Stamp
2014-12-10 00:01:08 -05:00
Brad King
66f587e7dc
Merge topic 'FindLATEX-use-FPHSA'
...
e0104063
FindLATEX: Use FPHSA to report status in standard way
2014-12-09 10:54:56 -05:00
Brad King
3b9477231d
Merge topic 'find_library-updated-directory-content'
...
ce331bab
find_library: Fix repeat call after changing directory content (#15293 )
2014-12-09 10:54:54 -05:00
Brad King
92eaa47077
Merge topic 'doc-find-module-no-summary'
...
3fb33e01
Merge branch 'backport-doc-find-module-no-summary' into doc-find-module-no-summary
d425c110
Help: Drop FeatureSummary example in cmake-developer.7
8235effe
Help: Drop FeatureSummary example in cmake-developer.7
2014-12-09 10:54:52 -05:00
Daniel Scharrer
009c1865dc
FindQt4: Fix handling of QT_VERSION_MAJOR mismatch
...
Fix capitalization of Qt4_FOUND variable when setting it to false in
this case. This caused find_package(Qt4) to appear successful when it
was not. Note that the legacy QT4_FOUND variable is unconditionally
overwritten at the end of the file with the value of Qt4_FOUND.
2014-12-09 10:43:02 -05:00
Brad King
ce53ef0be1
Merge branch 'backport-doc-find-module-no-summary' into release
2014-12-09 08:42:02 -05:00
Brad King
3fb33e01a1
Merge branch 'backport-doc-find-module-no-summary' into doc-find-module-no-summary
...
Resolve conflict in Help/manual/cmake-developer.7.rst by taking our
side.
2014-12-09 08:40:59 -05:00
Brad King
d425c11045
Help: Drop FeatureSummary example in cmake-developer.7
...
The use of FeatureSummary inside a find module is not a convention
yet used by upstream CMake modules. Drop the example from the
documentation about how to write find modules. If in the future
we add use of FeatureSummary to many of the upstream find modules
then this example can be restored as part of establishing the
convention.
2014-12-09 08:40:33 -05:00
Brad King
8235effe48
Help: Drop FeatureSummary example in cmake-developer.7
...
The use of FeatureSummary inside a find module is not a convention
yet used by upstream CMake modules. Drop the example from the
documentation about how to write find modules. If in the future
we add use of FeatureSummary to many of the upstream find modules
then this example can be restored as part of establishing the
convention.
2014-12-09 08:40:17 -05:00
Kitware Robot
2372cdaa3a
CMake Nightly Date Stamp
2014-12-09 00:01:08 -05:00
Brad King
ce331bab92
find_library: Fix repeat call after changing directory content ( #15293 )
...
We use cmGlobalGenerator::GetDirectoryContent to avoid repeating
directory listings. However, GetDirectoryContent loads content from
disk at most once. This breaks find_library calls that occur when disk
content has changed since preceding find_library calls.
Teach cmGlobalGenerator::GetDirectoryContent to save the directory
modification time when content is loaded and re-load content if it
changes.
Create a RunCMake.find_library test with a case covering this.
2014-12-08 15:35:50 -05:00
Brad King
95655dc730
Merge branch 'release'
2014-12-08 14:37:03 -05:00
Brad King
1f6f114a7a
CMake 3.1.0-rc3
2014-12-08 09:09:24 -05:00
Brad King
09498b2ead
Merge branch 'release'
2014-12-08 09:08:11 -05:00
Brad King
e72987dc11
Merge topic 'custom-command-multiple-outputs'
...
6c67b816
Makefile: Workaround Borland Make bug with multiple outputs
65ea5eb7
Tests: Cover rebuild with multiple custom command outputs (#15116 )
644b4688
Makefile: Fix rebuild with multiple custom command outputs (#15116 )
8a4c6d2d
Xcode: Fix rebuild with multiple custom command outputs (#15116 )
2014-12-08 09:07:18 -05:00
Brad King
cf54d8597d
Merge topic 'optional-latest-language-dialects'
...
de022e89
Add options to build CMake without latest language dialects
2014-12-08 09:07:16 -05:00
Brad King
47c41d902c
Merge topic 'file-LOCK-timeout-type'
...
97841dad
file: Use 'long' to represent the parsed LOCK TIMEOUT value
2014-12-08 09:07:14 -05:00
Brad King
79d1e1347a
Merge topic 'ctest-binary-pipe'
...
29b0c8c3
ctest --launch: write to cout and cerr in binary
2014-12-08 09:07:12 -05:00
Brad King
413ce02895
Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN'
...
636f0c1d
ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
2014-12-08 09:07:10 -05:00
Brad King
b61994d0a7
Merge topic 'vs-inherit-wd'
...
f545eb0b
VS: Inherit target-level "-wd" flags in source files (#15284 )
2014-12-08 09:07:08 -05:00
Brad King
c2b8874289
Merge topic 'FindMPI-Intel-5.0.1'
...
7626c8dc
FindMPI: Workaround Intel MPI 5.0.1 exit code problem (#15182 )
f5ede300
FindMPI: Factor out compiler wrapper execution into helper
2014-12-08 09:07:06 -05:00
Brad King
90070a65d2
Merge topic 'try_compile-link-flags'
...
88eb5824
try_compile: Pass linker flags into test project (#14066 )
a4f9b6f0
CMakeDetermineCompilerABI: Use normal linker flags in ABI project
2014-12-08 09:07:04 -05:00