Commit Graph

34650 Commits

Author SHA1 Message Date
Brad King
bb72fff2f0 Merge topic 'update-curl'
d4da4755 Help: Add notes for topic 'update-curl'
14c77153 Tests: Fix `file://` URLs given to curl
73ae6700 curl: Fix passing _WINSOCKAPI_ macro to compiler
1df9d5f9 Merge branch 'upstream-curl' into update-curl
4cc2908f curl 2016-12-22 (44b9b4d4)
f4a3290a curl: Update script to get curl 7.52.1
2017-02-10 13:36:11 -05:00
Brad King
f236c9cff9 Merge topic 'gcc-cpp98'
e2ee0971 g++ knows about C++98 selection flags since at least 3.4
2017-02-10 13:36:09 -05:00
Brad King
d4da4755cd Help: Add notes for topic 'update-curl' 2017-02-10 13:10:07 -05:00
Brad King
14c771530a Tests: Fix file:// URLs given to curl
Since upstream curl commit curl-7_52_0~131 (URL-parser: for
file://[host]/ URLs, the [host] must be localhost, 2016-11-11) we can no
longer use URLs of the form `file://c:/...` on Windows.  These worked
only accidentally before.  Use `file:///c:/...` instead.
2017-02-10 13:10:07 -05:00
Brad King
46c6489850 Merge topic 'sphinx-1.4'
30abf145 Help: Fix cmake code block warnings produced by Sphinx 1.4
97917900 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
971384c2 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
2017-02-10 11:32:21 -05:00
Brad King
30abf145fd Help: Fix cmake code block warnings produced by Sphinx 1.4
Some of our "cmake" code blocks do not use fully valid CMake syntax
because they have placeholders for human reference.  Sphinx has
never been able to properly lex and highlight these, but now warns.
Fix each block's syntax or change to a non-cmake block as appropriate.
2017-02-10 10:43:30 -05:00
Brad King
97917900d1 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
The `default.css` static content is no longer placed in the qthelp
`_static` directory.  If it does not exist, skip over it and insert
the content of `basic.css` directly into `cmake.css`.
2017-02-10 10:43:29 -05:00
Gregor Jasny
971384c287 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
Sphinx 1.4 introduced a breaking change to `indexnode` by changing
the length of a tuple.  Teach our extension to produce a tuple of
the proper length for the version of Sphinx in use.

This gets rid of the "4 column based index found" warning.
2017-02-10 10:24:25 -05:00
Kitware Robot
ada0bc21f4 CMake Nightly Date Stamp 2017-02-10 00:01:08 -05:00
Kitware Robot
90a55bb1d2 CMake Nightly Date Stamp 2017-02-09 00:01:05 -05:00
Rolf Eike Beer
e2ee097147 g++ knows about C++98 selection flags since at least 3.4
https://gcc.gnu.org/onlinedocs/gcc-3.4.0/gcc/C-Dialect-Options.html#C-Dialect-Options
2017-02-08 21:04:31 +01:00
Brad King
787c5f37dd Merge topic 'doc-cmake.org-version-switch'
82e5ab9e Utilities/Sphinx: Add option for cmake.org version switch to html
2017-02-08 09:17:43 -05:00
Brad King
82e5ab9e14 Utilities/Sphinx: Add option for cmake.org version switch to html
Leave the option undocumented since it is not for general use.  We can
simply pass it through `SPHINX_FLAGS` when building for publication on
`cmake.org`.
2017-02-08 08:19:10 -05:00
Kitware Robot
7e42a43c14 CMake Nightly Date Stamp 2017-02-08 00:01:07 -05:00
Brad King
73ae67006c curl: Fix passing _WINSOCKAPI_ macro to compiler
Define `_WINSOCKAPI_` blank rather than to 1 in order to match the
value used by Microsoft's winsock header files.

Backported from upstream curl commit 192466e0 (cmake: Fix passing
_WINSOCKAPI_ macro to compiler, 2017-01-09).

Fixes: #16545
2017-02-07 11:39:49 -05:00
Brad King
1df9d5f919 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05:00
Curl Upstream
4cc2908fda curl 2016-12-22 (44b9b4d4)
Code extracted from:

    https://github.com/curl/curl.git

at commit 44b9b4d4f56d6f6de92c89636994c03984e9cd01 (curl-7_52_1).
2017-02-07 11:37:30 -05:00
Brad King
f4a3290ae7 curl: Update script to get curl 7.52.1 2017-02-07 11:36:59 -05:00
Brad King
9bd017d20e Merge topic 'determine_id_without_user_specified_flags'
72ed051b CMakeDetermineCompilerId: check with and without user-specified flags
2017-02-07 09:59:47 -05:00
Brad King
6dec5d5fb8 Merge topic 'FindProtobuf-static-libs'
a3f71349 FindProtobuf: Add option to find static libraries on UNIX
2017-02-07 09:59:44 -05:00
Brad King
c756ad9e73 Merge topic 'FeatureSummary_description'
28e87033 FeatureSummary: Update release notes
6f62c66b FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global properties
f9bc8cfe FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summary
2017-02-07 09:59:41 -05:00
Brad King
4dbd03f6ef Merge topic 'wix-custom-root-id'
558a69fc CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable
2017-02-07 09:59:39 -05:00
Brad King
7642ca21b7 Merge topic 'update-kwsys'
c2645e19 Merge branch 'upstream-KWSys' into update-kwsys
95983ed8 KWSys 2017-02-06 (ef673998)
2017-02-07 09:59:36 -05:00
Kitware Robot
0a09717ea3 CMake Nightly Date Stamp 2017-02-07 00:01:12 -05:00
Sébastien GALLOU
a3f71349de FindProtobuf: Add option to find static libraries on UNIX
Add a `Protobuf_USE_STATIC_LIBS` input variable to optionally restrict
searches to static library names.  This follows the approach of
`FindBoost`.
2017-02-06 16:12:39 -05:00
Nils Gladitz
558a69fc90 CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable
The new variable allows specification of a custom root folder ID.
The implicit default is "ProgramFiles<64>Folder".

The "<64>" token is replaced by "" for 32-bit and "64" for 64-bit builds.

Inspired-By: Eric Backus
Fixes: #16573
2017-02-06 14:53:16 -05:00
Daniele E. Domenichelli
28e87033a3 FeatureSummary: Update release notes 2017-02-06 14:44:24 -05:00
Daniele E. Domenichelli
6f62c66b2c FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global properties
The global property FeatureSummary_<TYPE>_DESCRIPTION can be defined for
each type to replace the type name with the specified string whenever
the package type is used in an output string.
2017-02-06 14:44:24 -05:00
Daniele E. Domenichelli
f9bc8cfeeb FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summary
If enabled and only one package type is selected, it will print the
default title for the selected package type.
2017-02-06 14:44:23 -05:00
Brad King
fddc01bab3 Merge branch 'release' 2017-02-06 14:37:58 -05:00
Brad King
84df4a4950 Merge branch 'FeatureSummary-doc-cleanup' into release v3.8.0-rc1 2017-02-06 14:37:07 -05:00
Brad King
370e20c90e Merge topic 'FeatureSummary-doc-cleanup'
6cffc98c FeatureSummary: Fix documentation
2017-02-06 14:36:42 -05:00
Daniele E. Domenichelli
6cffc98ca0 FeatureSummary: Fix documentation 2017-02-06 14:35:30 -05:00
Michael Maltese
72ed051b12 CMakeDetermineCompilerId: check with and without user-specified flags
Clang may raise an error when passed a `-march=` option that doesn't
correspond to the current target triple.  CMake cannot pass the target
triple when determining the compiler id because it doesn't know how yet,
but it does pass along user-specified flags.  This breaks when those
user-specified flags include `-march=`.  Fix this use case by also
trying to find the compiler id without the user-specified flags.

Fixes: #16587
2017-02-06 13:12:06 -05:00
Brad King
c2645e1979 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-02-06 (ef673998)
2017-02-06 13:01:40 -05:00
KWSys Upstream
95983ed845 KWSys 2017-02-06 (ef673998)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit ef6739982f686648ef5ae6902aaf5fbaad891bce (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      8d8c86b5 testConsoleBuf: tighten the check for the /utf-8 flag

Gregor Jasny (1):
      d6b87625 SystemTools: Add helper function to check for FIFO file type
2017-02-06 13:01:39 -05:00
Brad King
0f4dae0a4d Begin post-3.8 development 2017-02-06 11:28:55 -05:00
Brad King
c9bb3530dc Merge branch 'release' 2017-02-06 11:27:26 -05:00
Brad King
566d20771f CMake 3.8.0-rc1 version update 2017-02-06 11:27:03 -05:00
Brad King
1d25e8a7c9 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2017-02-06 11:25:30 -05:00
Brad King
92be2fb392 Merge topic 'doc-3.8-relnotes'
c2f7ef63 Help: Organize and revise 3.8 release notes
3f5e4f19 Help: Consolidate 3.8 release notes
2017-02-06 11:16:06 -05:00
Brad King
c2f7ef637e Help: Organize and revise 3.8 release notes
Add section headers similar to the 3.7 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2017-02-06 10:35:28 -05:00
Brad King
3f5e4f1957 Help: Consolidate 3.8 release notes
Move all development release notes into a new version-specific document:

    tail -q -n +3 Help/release/dev/* > Help/release/3.8.rst
    git rm -- Help/release/dev/*

except the sample topic:

    git checkout HEAD -- Help/release/dev/0-sample-topic.rst

Reference the new document from the release notes index document.
Add a title and intro sentence to the new document by hand.
2017-02-06 10:34:12 -05:00
Brad King
811c854eff Merge topic 'vs-quote-rerun-paths'
f8f3cb8d VS: Fix quoting of special characters in cmake re-run check commands
2017-02-06 10:29:46 -05:00
Brad King
cf1bc84216 Merge topic 'productbuild_signing'
48aad9cd CPackProductBuild: Add options to sign packages
2017-02-06 10:29:44 -05:00
Brad King
a4c8ad5ed8 Merge topic 'androidtestutilities_cleanup'
8a5cb84b AndroidTestUtilities: do not require ExternalData unconditionally
9d34e51c AndroidTestUtilities: ignore exit status of ls
2017-02-06 10:29:40 -05:00
Brad King
59c50a1d3c Merge topic 'FindHDF5-fix-HDF5_ROOT'
cf0d8f1f FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths
5564c017 FindHDF5: Restore fallback to static libraries
4908969f FindHDF5: Fix search with HDF5_ROOT
77f6d22a FindHDF5: Use keywords in find_library calls
3d5ad723 FindHDF5: Initialize/finalize internal search options variable
ae89967f FindHDF5: Fix command-line parsing argument extraction order
2017-02-06 10:29:38 -05:00
Brad King
8e8eeb73ab Merge topic 'findmpi-flags-fix'
a2a73935 FindMPI: Remove leading spaces from flags
93f29be2 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use
2017-02-06 10:29:35 -05:00
Brad King
f8f3cb8d65 VS: Fix quoting of special characters in cmake re-run check commands
Fix our calls to `AddCustomCommandToOutput` for adding cmake re-run
check commands to disable old-style quoting in favor of the full quoting
logic.  This is necessary when paths contain special characters like `&`
that old-style quoting logic does not handle.

This also requires us to expand the `$(SolutionPath)` placeholder
explicitly because otherwise its expanded value will no longer be quoted
correctly.  As a side effect, this fixes the value in VS 10 and above
where the placeholder may be undefined when driving the build through
MSBuild without the `.sln` file.

Reported-by: Steven Cook <sc@harshbutfair.org>
Fixes: #16585
2017-02-06 09:53:15 -05:00
Kitware Robot
a00cca97b3 CMake Nightly Date Stamp 2017-02-06 00:01:04 -05:00