26708 Commits

Author SHA1 Message Date
Brad King
a65f7944a0 Merge topic 'ExternalProject-switch-ALWAYS'
a4605973 ExternalProject: Allow ALWAYS step property to be switched (#15368)
2015-01-26 09:51:57 -05:00
Brad King
cb243cce13 Merge topic 'update-kwsys'
391748d5 Merge branch 'upstream-kwsys' into update-kwsys
0b9aad75 KWSys 2015-01-23 (d4e7f08e)
2015-01-26 09:51:55 -05:00
Brad King
dfdcc42c60 Merge topic 'ninja-rsp_file-calculation'
097e26f4 ninja: use the minimum of all command line length limits (#14892)
2015-01-26 09:51:53 -05:00
Brad King
1337576b24 Merge topic 'curl-default-cainfo'
0abd3e53 cmake: Use a default CA path when not using system curl
6ce346c5 curl: Add CURL_CA_PATH option to CMake build process
2015-01-26 09:51:50 -05:00
Kitware Robot
e71c35ff26 CMake Nightly Date Stamp 2015-01-26 00:01:09 -05:00
Kitware Robot
5a9d54a67a CMake Nightly Date Stamp 2015-01-25 00:01:08 -05:00
Brad King
391748d57e Merge branch 'upstream-kwsys' into update-kwsys 2015-01-24 07:38:51 -05:00
KWSys Robot
0b9aad7568 KWSys 2015-01-23 (d4e7f08e)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ d4e7f08e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' b33e7b96..d4e7f08e
Brad King (1):
      d4e7f08e Directory: Check opendir return value before using it

Change-Id: I3485ec9c7ad3b7f25df610d4d1898c5150a995f0
2015-01-24 07:38:43 -05:00
Kitware Robot
97502ba77b CMake Nightly Date Stamp 2015-01-24 00:01:09 -05:00
Brad King
a4605973ff ExternalProject: Allow ALWAYS step property to be switched (#15368)
Within an existing build tree, if the stamp for a step already exists
when one activates the ALWAYS option, we still want it to always build.
Remove the step stamp file during CMake configuration to ensure it does
not exist when the ALWAYS option is enabled.
2015-01-23 13:38:59 -05:00
Ben Boeckel
097e26f490 ninja: use the minimum of all command line length limits (#14892)
When choosing whether to use a response file, consider several possible
command line length limits for the current operating system, and choose
the smallest.
2015-01-23 10:54:13 -05:00
Brad King
154bf8da99 Merge topic 'INTERFACE_SYSTEM_INCLUDE_DIRECTORIES-update'
85857e6d Help: Clarify INTERFACE_SYSTEM_INCLUDE_DIRECTORIES documentation.
ee38062b IncludeDirectories: Respect SYSTEM flag when using CONFIG genex.
2015-01-23 10:50:31 -05:00
Brad King
103f77e512 Merge topic 'test-complex-remove-bad-indentation'
560b3e9f Tests: Remove incorrect indentation from Complex test comment
2015-01-23 10:50:28 -05:00
Brad King
7961171db5 Merge topic 'FindCUDA-more-advanced-cache-entries'
005b409d FindCUDA: Mark more cache variables as advanced
2015-01-23 10:50:26 -05:00
Brad King
29ef8fb5be Merge topic 'update-curl'
53df9bce curl: Add README-CMake.txt
2015-01-23 10:50:24 -05:00
Brad King
9f559a2608 Merge topic 'GNU-4.4-compile-features'
374a66b5 Features: Blacklist raw string literals test for GNU 4.4
2015-01-23 10:50:22 -05:00
Brad King
0bda22f247 Merge topic 'FeatureSummary-fix-doc-typo'
b79d8f29 FeatureSummary: Fix bracket in documentation.
2015-01-23 10:50:19 -05:00
Brad King
6e66fb6e88 Merge topic 'add-missing-variable-docs'
bebdb454 Help: add missing MINGW variable documentation
2015-01-23 10:50:17 -05:00
Christoph Grüninger
b79d8f2934 FeatureSummary: Fix bracket in documentation. 2015-01-23 09:02:48 -05:00
Brad King
0abd3e538e cmake: Use a default CA path when not using system curl
When using system curl, we trust it to be configured with desired CA
certs.  When using our own build of curl, we use os-configured CA certs
on Windows and OS X.  On other systems, try to achieve this by searching
for common CA cert locations.  According to a brief investigation, the
curl packages on popular Linux distros are currently configured as:

* Arch: /etc/ssl/certs/ca-certificates.crt
* Debian with OpenSSL: /etc/ssl/certs
* Debian with GNU TLS: /etc/ssl/certs/ca-certificates.crt
* Debian with NSS: /etc/ssl/certs/ca-certificates.crt
* Fedora: /etc/pki/tls/certs/ca-bundle.crt
* Gentoo with OpenSSL: /etc/ssl/certs
* Gentoo without OpenSSL: /etc/ssl/certs/ca-certificates.crt

Teach CMake and CTest to look for these paths and use them as a CA path
or bundle when no other os-configured or user-specified CAs are
available.
2015-01-23 08:57:32 -05:00
Brad King
6ce346c53c curl: Add CURL_CA_PATH option to CMake build process
Move CMAKE_USE_OPENSSL and CURL_CA_BUNDLE up to the top of CMake so that
CMake's own sources can know their values.  Add the CURL_CA_PATH option
at the top and honor it as part of the curl build.
2015-01-23 08:23:52 -05:00
Kitware Robot
c99e19a4ac CMake Nightly Date Stamp 2015-01-23 00:01:16 -05:00
Stephen Kelly
85857e6d1c Help: Clarify INTERFACE_SYSTEM_INCLUDE_DIRECTORIES documentation. 2015-01-23 00:15:02 +01:00
Stephen Kelly
ee38062be8 IncludeDirectories: Respect SYSTEM flag when using CONFIG genex.
Update the Makefile and Ninja generators to use the config when
requesting the include flags.
2015-01-23 00:08:18 +01:00
Brad King
560b3e9f1d Tests: Remove incorrect indentation from Complex test comment 2015-01-22 14:11:46 -05:00
Brad King
98bf613cd0 Merge branch 'release' 2015-01-22 13:22:35 -05:00
Mark Abraham
005b409d6a FindCUDA: Mark more cache variables as advanced
Mark variables pertaining to specific situations relevant to CUDA
compilation as advanced since they are not part of normal usage.
2015-01-22 11:44:05 -05:00
Brad King
c0298947ff Merge topic 'cdash_upload_file_mode'
f3e0b6f1 CTestCoverageCollectGCOV: Add module to run gcov
6dd980e0 ctest_submit: Make CDASH_UPLOAD mode arguments more strict
5dc33f89 ctest_submit: Add CDASH_UPLOAD mode to upload files to CDash
2015-01-22 11:16:45 -05:00
Bill Hoffman
f3e0b6f1eb CTestCoverageCollectGCOV: Add module to run gcov
Provide a function to run gcov and create a tarball of results.
Since CDash tracks the md5sum of the files uploaded, use the
--mtime option with "cmake -E tar" so that tar files could be
created that would have the same md5sum with the same content.
2015-01-22 11:15:54 -05:00
Brad King
53df9bce19 curl: Add README-CMake.txt
Describe how to update curl from upstream.
2015-01-22 10:00:04 -05:00
Brad King
57f4c83462 Merge topic 'FindCUDA-cusolver'
e56c9327 FindCUDA: Add cuSOLVER library from CUDA 7.0
2015-01-22 09:50:42 -05:00
Brad King
3eda92df91 Merge topic 'update-kwsys'
7e468cd8 Merge branch 'upstream-kwsys' into update-kwsys
77444a7d KWSys 2015-01-20 (b33e7b96)
2015-01-22 09:50:40 -05:00
Brad King
529293e344 Merge topic 'WriteCompilerDetectionHeader-tests'
3c0996c1 WCDH: Test that no C compiler features are defined for CXX compiler.
8dc0c976 WCDH: Fix the C_STANDARD property in the tests.
2015-01-22 09:50:38 -05:00
Brad King
be2a74dbcb Merge topic 'GNU-4.4-compile-features'
965a50dc Features: Fix GNU 4.4 and 4.5 C standard level flags
7f4154a4 Features: Fix CompileFeatures non-feature tests for space in path
f40c19b5 Features: Fix CompileFeatures test for C non-features
2015-01-22 09:50:36 -05:00
Brad King
374a66b58c Features: Blacklist raw string literals test for GNU 4.4
RedHat gcc 4.4.7-11 supports raw string literals, so simply blacklist
the test for its rejection.
2015-01-22 09:39:35 -05:00
Kitware Robot
afe99212d2 CMake Nightly Date Stamp 2015-01-22 00:01:09 -05:00
Brad King
40c11f0f62 Merge topic 'jsoncpp-third-party'
27c6da93 Add option to build CMake against a system jsoncpp
2015-01-21 16:36:22 -05:00
Brad King
afd998373d Merge topic 'test-ctest_submit-fail-with-RunCMake'
ef97cd85 Tests: Fix obscure RunCMake.CTestSubmit 'drop' case failures
76f7eb2e Tests: Extend RunCMake.CTestSubmit test to cover 'drop' failures
2015-01-21 16:36:20 -05:00
Brad King
ef97cd8587 Tests: Fix obscure RunCMake.CTestSubmit 'drop' case failures
When curl is given a URL of the form '<something>://' it tries to
resolve '<something>' as a host name.  If the host happens to exist and
have a server then the drop might actually appear to work.  Instead use
an explicit '-no-site-' host to ensure it cannot connect.

Reported-by: Gilles Khouzam <Gilles.Khouzam@microsoft.com>
2015-01-21 16:34:42 -05:00
Andrew Seidl
e56c932795 FindCUDA: Add cuSOLVER library from CUDA 7.0 2015-01-21 15:54:12 -05:00
Ben Boeckel
bebdb4540b Help: add missing MINGW variable documentation 2015-01-21 15:48:00 -05:00
Brad King
965a50dcea Features: Fix GNU 4.4 and 4.5 C standard level flags
The C90 flags were only the "89" versions until GNU 4.5.
The C11 flags were not introduced until GNU 4.6.
2015-01-21 15:47:13 -05:00
Brad King
7f4154a4aa Features: Fix CompileFeatures non-feature tests for space in path
Fix the <lang>_non_features try_compile calls to work correctly when
there is a space in the path.  Otherwise they all fail due to the space
instead of the lack of a feature.
2015-01-21 15:42:08 -05:00
Brad King
f40c19b543 Features: Fix CompileFeatures test for C non-features
Add a "feature_test.c" file corresponding to "feature_test.cpp" but for
the C language.  This source will be needed by C_non_features entries.
2015-01-21 15:40:47 -05:00
Brad King
7e468cd8f9 Merge branch 'upstream-kwsys' into update-kwsys 2015-01-21 09:15:44 -05:00
KWSys Robot
77444a7d48 KWSys 2015-01-20 (b33e7b96)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ b33e7b96 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 425fa73e..b33e7b96
Brad King (2):
      57c3ef1d Suppress deprecation warnings for GetVersionEx on Intel compiler
      b33e7b96 FStream: Fix exception spec on our standard stream replacements

Change-Id: I69044c5879a1ec4a5be59bdda05540c1eb65b197
2015-01-21 09:15:40 -05:00
Kitware Robot
f709776864 CMake Nightly Date Stamp 2015-01-21 00:01:10 -05:00
Brad King
57622bd19d CMake 3.1.1 2015-01-20 11:04:44 -05:00
Brad King
9b4d4344c6 Merge branch 'release' 2015-01-20 11:03:53 -05:00
Brad King
27c6da933e Add option to build CMake against a system jsoncpp
Create a CMAKE_USE_SYSTEM_JSONCPP option.
2015-01-20 10:37:35 -05:00