39820 Commits

Author SHA1 Message Date
Basil Fierz
3c4698da3a VS: Allow toolset version selection to specify default toolset
Teach the feature added by commit v3.12.0-rc1~38^2 (VS: Add option to
select the version of the toolset used by VS 2017, 2018-05-19) to accept
the default toolset version in addition to older versions.  If the
default toolset version is supplied, simply clear it so the default will
be used.

Fixes: #18107
2018-06-24 10:36:03 -04:00
Basil Fierz
b759f7068f cmVSSetupHelper: Expose default toolset version
We already detect the VS toolset version.  Expose it to clients.
2018-06-22 10:07:09 -04:00
Brad King
d548994afc cmVSSetupHelper: Use in-class member initialization 2018-06-22 10:07:09 -04:00
Brad King
ef5e2e8a62 Merge branch 'sphinx-info' into release-3.12
Merge-request: !2146
v3.12.0-rc1
2018-06-13 10:52:11 -04:00
Brad King
985c78c7e1 Merge branch 'restore-windows-resources-through-link' into release-3.12
Merge-request: !2147
2018-06-13 10:52:01 -04:00
Brad King
93fe9fc1a2 Merge branch 'UseSWIG-csharp-variant' into release-3.12
Merge-request: !2137
2018-06-13 10:51:49 -04:00
Rishi Theivendran
0c2fb4c896 UseSWIG: Add CSHARP variant for wrapper files
Issue: #18065
Fixes: #18066
2018-06-12 11:34:58 -04:00
Brad King
4e6ff0ae24 Windows: Restore support for running CMake through a symlink
The change in commit v3.11.3~3^2 (cmSystemTools: Revert GetRealPath
implementation on Windows, 2018-05-29) broke the feature added by commit
v3.11.0-rc1~64^2 (Windows: Add support for running CMake tools through a
symlink, 2018-01-21).  Use `GetRealPathResolvingWindowsSubst` in the
latter code path to restore it.

Fixes: #17882
2018-06-12 11:15:50 -04:00
Orivej Desh
276e369813 Utilities/Sphinx: Add option to build and install Info manual
Add option `SPHINX_INFO` to enable the Sphinx 'texinfo' builder and use
the `makeinfo` tool to convert it to a `.info` file.
2018-06-12 10:25:37 -04:00
Brad King
f024f4f8a0 Merge branch 'UseSWIG-fix-genex' into release-3.12
Merge-request: !2143
2018-06-12 10:08:36 -04:00
Marc Chevrier
88dd5dc9ff UseSWIG: add support for generator expressions 2018-06-12 10:07:24 -04:00
Brad King
3dd046a84b Merge branch 'UseSWIG-handle-SWIG_MODULE_NAME' into release-3.12
Merge-request: !2145
2018-06-12 10:00:41 -04:00
Felix Schwitzer
156138d5f1 UseSWIG: Fix handling of SWIG_MODULE_NAME source file property
Fix a typo from commit 0bef9eb410 (UseSWIG: modernize module,
2018-01-29) that caused `UseSWIG` to ignore an eventually set property
`SWIG_MODLUE_NAME`.

Building multiple python modules using the mentioned property as
described in the docs could lead to an invalid, or even worse,
inconsistent `build.ninja` file.  The reason is that the generated list
of support files was not unique.  For each module the support file was
always named the same, namely `path/to/builddir/MODULENAME.py`.
2018-06-12 09:55:53 -04:00
Brad King
1f3221f365 Merge branch 'FindPython-3.8' into release-3.12
Merge-request: !2140
2018-06-08 09:42:29 -04:00
Marcel Plch
b6e7f2c37f FindPython: Add support for version 3.8
Python 3.7 is about to be released, making the development version 3.8.
2018-06-08 09:42:18 -04:00
Brad King
c984bf668b Merge branch 'ninja-win-rsp' into release-3.12
Merge-request: !2136
2018-06-08 09:32:14 -04:00
Matthijs Kool
88365838b8 Ninja: Use native slashes to pass rsp files
Some tools on Windows (e.g. Embarcadero linkers) can't handle forward
slashes in paths to rsp files.
2018-06-08 09:31:23 -04:00
Brad King
e446d71d31 Merge branch 'CMakePackageConfigHelpers-doc' into release-3.12
Merge-request: !2138
2018-06-07 10:47:02 -04:00
Ruslan Baratov
aeda8fcceb Help: Package without components should use 'check_required_components' too
Macro 'check_required_components' should be called even if there are no
components provided by package.  This will make sure error is reported
in next cases:

    find_package(Foo CONFIG REQUIRED oops) # 'oops' treated as component
    find_package(Foo CONFIG REQUIRED COMPONENTS foo) # no components expected
2018-06-07 10:41:45 -04:00
Brad King
af63c8bd61 CMake 3.12.0-rc1 version update 2018-06-05 11:43:10 -04:00
Brad King
1566dc1e3b Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2018-06-05 11:41:29 -04:00
Brad King
90ebc32d9e Merge topic 'doc-3.12-relnotes'
049cc31d84 Help: Organize and revise 3.12 release notes
27bba7e8aa Help: Consolidate 3.12 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2132
2018-06-05 11:40:16 -04:00
Brad King
d902fb0cf6 Merge topic 'intel-compile-features'
f719a13c28 Features: Add special case to disable relaxed constexpr for Intel 18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2133
2018-06-05 11:28:35 -04:00
Brad King
8dbccd050c Merge topic 'more-misc-typos'
be28106880 Fix misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !2130
2018-06-05 11:26:12 -04:00
Brad King
054bc6a330 Merge branch 'release-3.11' 2018-06-05 11:24:53 -04:00
Brad King
21b7e14800 Merge topic 'ep-support-passing-var-ending-with-notfound'
7ad5165c67 ExternalProject: Fix cache generation when args end with "-NOTFOUND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2127
2018-06-05 11:23:49 -04:00
Brad King
2ccd426045 Merge branch 'external-project-url-hash-docs' into release-3.11
Merge-request: !2134
2018-06-05 11:21:11 -04:00
Craig Scott
f790273ef0 Merge topic 'fix/CPackNuGet-var-para-deindent'
afcb68a0c1 Help: Fix indentation for `CPACK_NUGET_PACKAGE_AUTHORS`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2135
2018-06-05 06:03:14 -04:00
Alex Turbov
afcb68a0c1 Help: Fix indentation for CPACK_NUGET_PACKAGE_AUTHORS 2018-06-05 19:59:51 +10:00
Craig Scott
d8ea0afa30 Merge topic 'external-project-url-hash-docs'
470ff56e5a ExternalProject: Improve URL_HASH argument description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2134
2018-06-05 05:47:29 -04:00
Kitware Robot
0fa6f8b2f5 CMake Nightly Date Stamp 2018-06-05 00:01:07 -04:00
Matt McCormick
470ff56e5a
ExternalProject: Improve URL_HASH argument description
The previous documentation suggested

  ALGO=MD5=d7a3dc7757a35df3dbb890f7dee0976b

for example.
2018-06-04 16:17:58 -04:00
Brad King
f719a13c28 Features: Add special case to disable relaxed constexpr for Intel 18
Intel compilers define `__cpp_constexpr` to `200704` even in C++14 mode.
This indicates that the `cxx_relaxed_constexpr` feature is not
available.  However, Intel 17 and above document support for it.  In
commit v3.8.0~9^2 (Features: Update features for Intel C++ 17.0.2 on
UNIX, 2017-03-31) we added a special check for this case.  Intel 17 and
19 work.  However, Intel 18 does not seem to work and fails our test
case.  Add a special case to disable the feature for Intel 18.
2018-06-04 13:52:11 -04:00
Brad King
049cc31d84 Help: Organize and revise 3.12 release notes
Add section headers similar to the 3.11 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2018-06-04 13:23:02 -04:00
Brad King
27bba7e8aa Help: Consolidate 3.12 release notes
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.12.rst`.
2018-06-04 11:42:30 -04:00
Brad King
25845a917a Merge branch 'ep-support-passing-var-ending-with-notfound' into release-3.11
Merge-request: !2127
2018-06-04 11:39:55 -04:00
Jean-Christophe Fillion-Robin
7ad5165c67 ExternalProject: Fix cache generation when args end with "-NOTFOUND"
Generalize the fix in commit v3.11.0-rc4~8^2 (ExternalProject: Fix cache
generation when last args ends with "-NOTFOUND", 2018-03-10) to work for
any argument rather than just the last one.

ExternalProject can now successfully generate the cache file when any
(not only the last one) cache variable associated with either
`CMAKE_CACHE_ARGS` or `CMAKE_DEFAULT_CACHE_ARGS` configure step option
is set to a `<value>` ending with `-NOTFOUND`.
2018-06-04 11:37:52 -04:00
Brad King
07bddeae14 Merge topic 'fix-ti-c-standard'
9e27881bb1 TI: Add support for C language standards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2131
2018-06-04 11:34:35 -04:00
Arnaud Gelas
9e27881bb1 TI: Add support for C language standards
Set C90 and C99 compile options for TI compiler.

Fixes: #18061
2018-06-04 10:48:02 -04:00
luz.paz
be28106880 Fix misc. typos
Found via `codespell` and `grep`
2018-06-04 10:32:49 -04:00
Brad King
1bbee86bf2 Merge topic 'WriteBasicConfigFile_tests'
56f45bb79d Refactor write_basic_package_version_file tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2122
2018-06-04 09:52:00 -04:00
Brad King
fbd34ecd35 Merge topic 'gnu-CMAKE_LANG_COMPILER_PREDEFINES_COMMAND'
caa138c1a5 Move GNU COMPILER_PREDEFINES_COMMAND from Platform to Compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2121
2018-06-04 09:51:31 -04:00
Brad King
003c30fa18 Merge topic 'libarchive-ssize_t'
6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2126
2018-06-04 09:49:13 -04:00
Brad King
5a9a3d28a4 Merge topic 'update-kwsys'
81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
3af8c7715b KWSys 2018-06-01 (8ef62b28)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2125
2018-06-04 09:45:56 -04:00
Kitware Robot
f70da4ed83 CMake Nightly Date Stamp 2018-06-04 00:01:05 -04:00
Kitware Robot
72d5f23caf CMake Nightly Date Stamp 2018-06-03 00:01:05 -04:00
Kitware Robot
4b5d2249bf CMake Nightly Date Stamp 2018-06-02 00:01:07 -04:00
Brad King
6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1
In commit a203fcc63d (cmake: Teach '-E tar' to report errors copying
data, 2018-05-16) we introduced use of `la_ssize_t` but that was not
available until libarchive 3.3.1.  Switch to the `__LA_SSIZE_T` macro
we use elsewhere.
2018-06-01 13:27:08 -04:00
Brad King
81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-01 (8ef62b28)
2018-06-01 12:54:13 -04:00
KWSys Upstream
3af8c7715b KWSys 2018-06-01 (8ef62b28)
Code extracted from:

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

at commit 8ef62b289e0a99856893ef49106c2b2d94e9dd0c (master).

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

Brad King (2):
      6b9c233c clang-format.bash: update to clang-format-6.0
      b7a341cf Empty commit at end of history preceding clang-format-6.0 style transition

Kitware Robot (1):
      828b6837 Revise C++ coding style using clang-format-6.0
2018-06-01 12:54:12 -04:00