Commit Graph

40092 Commits

Author SHA1 Message Date
Brad King b2b3872f22 Merge branch 'FindMatlab-doc-mcr' into release-3.12
Merge-request: !2173
2018-06-26 11:28:40 -04:00
Brad King 27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support
This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab:
Matlab Runtime Compiler support, 2018-04-29).
2018-06-26 11:12:19 -04:00
Kitware Robot d45d5e28ec CMake Nightly Date Stamp 2018-06-26 00:01:10 -04:00
Brad King 07cfb18f9d Merge branch 'release-3.12' 2018-06-25 10:21:10 -04:00
Brad King 2c36dabbee Merge topic 'libuv-new-version-file-location'
889033b5c6 FindLibUV: Also check uv/version.h for version detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2169
2018-06-25 10:20:38 -04:00
Brad King 7e283acde7 Merge branch 'libuv-new-version-file-location' into release-3.12
Merge-request: !2169
2018-06-25 10:17:38 -04:00
Raphael Kubo da Costa 889033b5c6 FindLibUV: Also check uv/version.h for version detection
Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
Make FindLibUV aware of the file's new location for configuration to work.
2018-06-25 10:16:46 -04:00
Brad King e9ec0cc3bb Merge topic 'update-kwsys'
b41b30f16e Update use of KWSys SystemTools::SplitString for new signature
f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys
6d7fdedde6 KWSys 2018-06-22 (49068d94)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2165
2018-06-25 09:57:35 -04:00
Brad King 8848a1c07a Merge topic 'test-wizard'
7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2166
2018-06-25 09:56:56 -04:00
Brad King 268919069b Merge branch 'release-3.12' 2018-06-25 09:55:05 -04:00
Brad King ae153c6914 Merge topic 'vs-filter-default-toolset'
3c4698da3a VS: Allow toolset version selection to specify default toolset
b759f7068f cmVSSetupHelper: Expose default toolset version
d548994afc cmVSSetupHelper: Use in-class member initialization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2162
2018-06-25 09:54:11 -04:00
Brad King 383f29fd63 Merge topic 'file-GLOB-remove-new-errors'
142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Shane Parris <shane.lee.parris@gmail.com>
Merge-request: !2164
2018-06-25 09:53:24 -04:00
Brad King 00523ad9c5 Merge branch 'vs-filter-default-toolset' into release-3.12
Merge-request: !2162
2018-06-25 09:39:30 -04:00
Kitware Robot 8e50de4dc5 CMake Nightly Date Stamp 2018-06-25 00:01:05 -04:00
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
Kitware Robot daf472f9be CMake Nightly Date Stamp 2018-06-24 00:01:08 -04:00
Craig Scott 3f58967887 Merge topic 'cmake-buildsystem-manual-typo'
82956270ed Help: Fix typo in cmake-buildsystem(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2163
2018-06-23 17:20:50 -04:00
Kitware Robot 4b7e9cabc2 CMake Nightly Date Stamp 2018-06-23 00:01:13 -04:00
Brad King 7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine
Avoid a whole separate test for one removed command-line option.
2018-06-22 13:59:14 -04:00
Brad King b41b30f16e Update use of KWSys SystemTools::SplitString for new signature 2018-06-22 13:38:18 -04:00
Brad King f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-22 (49068d94)
2018-06-22 11:31:36 -04:00
KWSys Upstream 6d7fdedde6 KWSys 2018-06-22 (49068d94)
Code extracted from:

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

at commit 49068d948ee03cde172fe5ff15a2778c50f91d38 (master).

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

Brad King (1):
      5d6f59fe SystemTools: Change SplitString return type to use std::string
2018-06-22 11:31:35 -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 44ca3d922c Merge topic 'cpack-generator-documentation'
57e4c51e8a Help: Update old version release notes for CPack generator docs
4181830881 Help: Add release notes for CPack generator documentation and module updates
48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory
2a2829cc75 Help: Add new section for CPack generators
be6267808a CPackIFW: Turn documentation into a block comment
0180524c7a Help: Move legacy CPack modules into separate section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2149
2018-06-22 09:48:00 -04:00
Brad King 5e1f519037 Merge topic 'cmake_autogen_verbose'
5b85ef5cd0 Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSE
6651aab2ab Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSE
aa7d8a092c Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all tests
e28dc3b1d8 Autogen: Add CMAKE_AUTOGEN_VERBOSE variable support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2157
2018-06-22 09:46:17 -04:00
Brad King 1a21b4695a Merge topic 'vs_debugger'
797de7a6f6 VS10Project: Expand VS_DEBUGGER_* capabilities

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2150
2018-06-22 09:45:19 -04:00
Brad King 221f8aa7e2 Merge branch 'file-GLOB-remove-new-errors' into release-3.12
Merge-request: !2164
2018-06-22 09:42:07 -04:00
Brad King c03aeda083 Merge branch 'release-3.12' 2018-06-22 09:41:33 -04:00
Brad King 142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions
Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand,
2018-02-13) introduced error diagnostics for argument combinations that
were previously accepted.  Restore acceptance to avoid regressing
projects that used those combinations even if they do not make sense.

Fixes: #18097
2018-06-22 09:39:05 -04:00
Brad King 7b46f59ee1 Merge topic 'FindJPEG-fix-debug'
ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2159
2018-06-22 09:15:47 -04:00
Daniel Franke 5b0f73a15a math: Use 64-bit integer type for computation 2018-06-22 09:00:34 -04:00
Daniel Franke 963b8d9f6c math: Add RunCMake.math test to prepare for error cases 2018-06-22 09:00:34 -04:00
Joan Massich 82956270ed Help: Fix typo in cmake-buildsystem(7) manual 2018-06-22 11:26:59 +02:00
Kitware Robot 0375d73270 CMake Nightly Date Stamp 2018-06-22 00:01:07 -04:00
Robert Maynard 12e6f83319 Option: Add a test that verifies interaction with normal variables 2018-06-21 14:52:12 -04:00
Brad King 57e4c51e8a Help: Update old version release notes for CPack generator docs
Replace references to the CPack "modules" with proper terminology
referencing the CPack generator documentation directly.
2018-06-21 13:54:57 -04:00
Sebastian Holtermann 5b85ef5cd0 Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSE 2018-06-21 19:18:18 +02:00
Sebastian Holtermann 6651aab2ab Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSE 2018-06-21 19:18:18 +02:00
Sebastian Holtermann aa7d8a092c Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all tests 2018-06-21 19:16:40 +02:00
Sebastian Holtermann e28dc3b1d8 Autogen: Add CMAKE_AUTOGEN_VERBOSE variable support
Setting CMAKE_AUTOGEN_VERBOSE enables verbose output during
AUTOMOC, AUTOUIC and AUTORCC generation.
2018-06-21 19:16:40 +02:00
Robert Maynard 5bb3d40a28 cmOption: Remove VTK 4.0 workarounds
CMake has no reason to have special logic to fix bad logic
within VTK 4.0.
2018-06-21 11:18:16 -04:00
Kyle Edwards 4181830881 Help: Add release notes for CPack generator documentation and module updates 2018-06-21 11:00:29 -04:00
Kyle Edwards 48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory
These modules are not meant to be included by user code, they are
only an internal implementation detail for CPack. Having them live
in the main Modules directory with documentation was misleading, so
they have been moved into Modules/Internal/CPack, and their
documentation has been stripped following its move into the new
"CPack Generators" section. No-op modules which contained only
documentation have been removed entirely.

The only module that hasn't been moved is CPackIFW, because it
contains user-facing macros which would be lost if it were moved.
So, the CPackIFW module has been updated with a note explaining what
needs to (eventually) happen.
2018-06-21 11:00:28 -04:00
Kyle Edwards 2a2829cc75 Help: Add new section for CPack generators
The documentation for CPack generators previously lived in their
respective internal CMake modules. This setup was misleading,
because it implied that you should include the modules in your own
code, which is not the case. Moving the documentation into a
separate section does a better job of hiding the internal modules,
which are just an implementation detail. The generator documentation
has also been modified to remove any references to the module name.

The CPackIFW module is a special exception: since it has user-facing
macros, the documentation for these macros has been kept in the module
page, while all other documentation related to the IFW generator has
been moved into the new section.

To make it easier to find the new documentation, the old help pages
for the CPack*.cmake modules have not been deleted, but have been
replaced with a link to their respective help page in the new
documentation section.
2018-06-21 11:00:25 -04:00
Kyle Edwards be6267808a CPackIFW: Turn documentation into a block comment 2018-06-21 10:57:29 -04:00
Brad King 5dc9f440c5 Merge branch 'FindJPEG-fix-debug' into release-3.12
Merge-request: !2159
2018-06-21 10:50:48 -04:00
Andrey Karpov ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
These have been deprecated since 2002!
2018-06-21 10:47:03 -04:00
Andrey Karpov 7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration
The change in commit v3.12.0-rc1~202^2~1 (FindJPEG: Add multi config
support and associated docs, 2018-04-17) accidentally left out the
default jpeg library names from consideration for debug variants.
2018-06-21 10:47:03 -04:00
Kyle Edwards 0180524c7a Help: Move legacy CPack modules into separate section
These modules are being moved out of user visibility and into an
internal section of CMake. To keep them for historical reference in
the manual, this commit moves them into a separate "Legacy CPack
Modules" section.
2018-06-21 10:46:10 -04:00