Commit Graph
47352 Commits
Author SHA1 Message Date
Brad King fb378fc4d7 Tests: Fix Cuda test project names
Make them match what `ADD_TEST_MACRO` gives to ctest as the
project name to build so that the `.sln` file will be found.
2018-10-10 13:29:47 -04:00
Kyle Edwards 0d988f98e5 cmake_policy: Add undocumented GET_WARNING command
This command is intended for modules that issue policy warnings so
they can get the warning string from CMake in a uniform manner,
rather than duplicating the string. Several modules been updated
to include an example of the usage of this new command.
2018-10-10 10:56:00 -04:00
Kyle Edwards f9f96598df Help: Convert FindOpenGL documentation to block comment 2018-10-10 10:56:00 -04:00
Kyle Edwards b56f2db87a Testing: Add test for CMP0082 2018-10-10 10:26:40 -04:00
Kyle Edwards fc8955e889 add_subdirectory: Run subdirectory install rules in correct order
Before this change, install rules created by add_subdirectory()
would be executed after all of the top-level install rules, even
if they were declared before the top-level rules. This change
adds a new policy, CMP0082, which interleaves the add_subdirectory()
install rules with the other install rules so they are run in the
correct order.
2018-10-10 10:26:39 -04:00
Kyle Edwards 514f0b572e Testing: Update hard-coded line numbers to [0-9]+ in some tests 2018-10-10 10:06:27 -04:00
Brad King 3499c91a1b Merge branch 'release-3.12' 2018-10-10 10:00:16 -04:00
Brad King 32fdbd57a8 Merge branch 'backport-FindMatlab-missing-install' into release-3.12
Merge-request: !2471
2018-10-10 09:59:47 -04:00
Brad King e92cc29785 Merge topic 'backport-FindMatlab-missing-install'
7772bd31f5 FindMatlab: Guard against nonexistent installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2471
2018-10-10 09:59:09 -04:00
Chuck Atkins 7772bd31f5 FindMatlab: Guard against nonexistent installation
Logic added by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime
Compiler support, 2017-04-29) assumes that `VersionInfo.xml` exists
in the installation.  Fix it to tolerate a missing or empty file.

This change was originally made by commit v3.13.0-rc1~173^2 (FindMatlab:
Guard against nonexistent installation, 2018-08-27).  Here we backport
it to the 3.12.x series.

Fixes: #18436
2018-10-10 09:53:58 -04:00
Brad King 8f076acdb0 cmLocalGenerator: Remove AddCompileDefinitions method
This method offers the same definitions as `GetTargetDefines` except
that it excludes the "export" macro on shared libraries.  Update call
sites to use `GetTargetDefines` instead.  Some of them were incorrectly
excluding the export macro.
2018-10-10 09:34:12 -04:00
Craig Scott 5dd16bc92c Merge topic 'module-index-restructure'
dc372f6eef Help: Document Use_wxWindows.cmake as deprecated
846e3d2ceb Help: Reorganise module index into sections
c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2463
2018-10-10 08:49:23 -04:00
Brad King f39bc297db Merge branch 'release-3.13' 2018-10-10 07:25:03 -04:00
Brad King 2e0aef2d75 Merge topic 'update-vim-syntax'
7330a89f56 Merge branch 'upstream-vim-cmake-syntax'
456d96f0d5 vim-cmake-syntax 2018-10-10 (ac1957fb)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2469
2018-10-10 07:24:27 -04:00
Brad King a8a485715a Merge branch 'update-vim-syntax' into release-3.13
Merge-request: !2469
2018-10-10 07:18:48 -04:00
Patrick Boettcher 7330a89f56 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2018-10-10 (ac1957fb)
2018-10-10 07:17:08 -04:00
Brad King b62d15c216 Merge topic 'project-version'
2f43bd3b6c Help: move description of CMAKE_PROJECT_* variables
e3e5445d83 Help: Describe options of command project in a definition list.
5b56795d57 Help: make the two signatures of command "project" orthogonal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2450
2018-10-10 07:05:03 -04:00
Brad King d24227da68 Merge topic 'if-synopsis'
ba90611225 Help: Make synopsis of if command more compact; add section headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2451
2018-10-10 07:04:21 -04:00
Betsy McPhail a6e0158712 ctest_submit: Add support for a "Done" part
Teach CTest to submit Done.xml. Submission of this file indicates to
CDash that a build is complete and no more files will be uploaded. It
contains the build id returned by CDash and the current time.

This file is submitted last for a given build when using the
`ctest_submit()` command.

If submitting by PARTS, use `ctest_submit(PARTS Done)`.
2018-10-10 06:55:59 -04:00
Betsy McPhail f460bbd4c8 ctest_submit: Refactor file list to use a vector instead of a set
Remove duplicates in a way that preserves order.
2018-10-10 06:55:05 -04:00
vim-cmake-syntax upstream 456d96f0d5 vim-cmake-syntax 2018-10-10 (ac1957fb)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit ac1957fbccd24abc91089517f9116272825f8340 (master).

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

Pablo Hernandez-Cerdan (1):
      baf680ae Add syntax for new cmake variables

Patrick Boettcher (5):
      2c9d5fda handle bracket-comments and arguments correctly
      37d3bcb0 add test for bracket-comments and arguments
      99b4a3d9 promote package_config_file-st to .in-file and add test
      3ed26c29 update to cmake version 3.13.20181010-ga3598
      ac1957fb update README
2018-10-10 10:55:01 +02:00
Tomasz Słodkowicz 045b0beae1 FindwxWidgets: implement detailed components status on Windows 2018-10-10 08:45:56 +02:00
Kitware Robot a35981249d CMake Nightly Date Stamp 2018-10-10 00:01:07 -04:00
Brad King b57560bb0f Merge topic 'readme-build-docs'
af6f16f1e8 README: Explain how to build CMake with the docs
ae80271ed3 README: Fix typo (rm space).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2466
2018-10-09 12:02:23 -04:00
Joachim Wuttke (o) af6f16f1e8 README: Explain how to build CMake with the docs 2018-10-09 17:57:32 +02:00
Craig Scott dc372f6eef Help: Document Use_wxWindows.cmake as deprecated
The implementation already logged a message saying that the module
was deprecated. This change adds that message to the module docs.
2018-10-09 17:13:52 +02:00
Joachim Wuttke (l) 846e3d2ceb Help: Reorganise module index into sections
* Split up module list into separate sections for utility modules
  and find modules.
* Improve wording to explain how the different module types
  are expected to be called/used.
* Move deprecated modules to their own separate sections.
2018-10-09 17:13:11 +02:00
Brad King 517cc8e1ef Merge branch 'release-3.13' 2018-10-09 10:16:35 -04:00
Joachim Wuttke (o) 2f43bd3b6c Help: move description of CMAKE_PROJECT_* variables
Describe these variables along with the other variables.
2018-10-09 15:28:53 +02:00
Brad King 6784acfbe0 CMake 3.13.0-rc1 v3.13.0-rc1 2018-10-09 09:04:28 -04:00
Brad King d96aa16310 Merge branch 'release-3.13' 2018-10-09 09:03:52 -04:00
Brad King afd5d17bac Merge topic 'FindBISON-fix-verbose-file'
c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2467
2018-10-09 09:03:10 -04:00
Brad King f6193d92fd Merge branch 'FindBISON-fix-verbose-file' into release-3.13
Merge-request: !2467
2018-10-09 09:01:21 -04:00
Brad King c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output
When `BISON_TARGET` is called with both

    VERBOSE <extra-file> REPORT_FILE <file>

we add a custom command to copy `<file>` to `<extra-file>`.  The change
in commit v3.7.1~10^2 (FindBISON: Do not rebuild every time when not
VERBOSE, 2016-11-14) incorrectly listed the extra file as an output of
the main bison invocation custom command, but it is actually produced by
the separate copy command.  Fix the logic to always generate `<file>` as
an output of the bison command and `<extra-file>` as an output of the
copy command.

Fixes: #18433
2018-10-09 08:55:54 -04:00
Joachim Wuttke (l) e3e5445d83 Help: Describe options of command project in a definition list.
Also add section headers;
explain default setting of optional argument variables.
2018-10-09 14:29:57 +02:00
Joachim Wuttke (l) 5b56795d57 Help: make the two signatures of command "project" orthogonal 2018-10-09 14:22:09 +02:00
Joachim Wuttke (l) ba90611225 Help: Make synopsis of if command more compact; add section headers
Also replace 'expression' by 'condition' (as in the while command);
relegate optional arguments of else() and endif() to the text;
revise explanation of operator precedence in Condition Syntax section.
2018-10-09 14:04:24 +02:00
Brad King 577a9a88ad Merge branch 'release-3.13' 2018-10-09 07:43:14 -04:00
Brad King 03e381cb8a Merge topic 'string-TIMESTAMP-unset-TZ'
f23760ffac string(TIMESTAMP): Fix unset TZ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Attila Krasznahorkay <attila.krasznahorkay@gmail.com>
Merge-request: !2464
2018-10-09 07:42:45 -04:00
Joachim Wuttke (l) c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake. 2018-10-09 22:41:44 +11:00
Brad King 54f0ae5414 Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13
Merge-request: !2464
2018-10-09 07:33:56 -04:00
Jose Luis Blanco-Claraco f23760ffac string(TIMESTAMP): Fix unset TZ
The logic added by commit v3.6.0-rc1~338^2 (CMake: Extend TIMESTAMP
sub-commands with new unix time format specifier, 2016-02-16) to restore
the `TZ` environment variable does not properly handle the case in which
the variable was originally not set.  Unset the variable in this case.

Fixes: #18431
2018-10-09 07:26:40 -04:00
Joachim Wuttke (o) ae80271ed3 README: Fix typo (rm space). 2018-10-09 13:26:17 +02:00
Brad King 092a0b104a Merge branch 'release-3.13' 2018-10-09 06:35:20 -04:00
Brad King efa5d5c781 Merge branch 'doc-regex-backslash' into release-3.13
Merge-request: !2460
2018-10-09 06:34:34 -04:00
Brad King 3ea9d81da6 Merge topic 'doc-regex-backslash'
fab2c2339b Help: Fix documentation of escape sequences in a regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2460
2018-10-09 06:34:06 -04:00
Brad King fab2c2339b Help: Fix documentation of escape sequences in a regex
Documentation added by commit 4b35dab891 (Help: Document how escape
sequences work in a regex, 2018-07-18) is only correct for backslashes
inside `[]` groups.  The regex engine does interpret `\` escapes
elsewhere.  Fix the docs.

Inspired-by: R2RT <artur.ryt@gmail.com>
Fixes: #18428
2018-10-09 06:31:37 -04:00
Brad King 92ed3b38cc Merge branch 'vs-flag-map-Qspectre' into release-3.13
Merge-request: !2462
2018-10-09 06:28:57 -04:00
Brad King 0e2799019f Merge branch 'mkl_ilp64' into release-3.13
Merge-request: !2444
2018-10-09 06:28:49 -04:00
Brad King 424851742e Merge topic 'mkl_ilp64'
d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2444
2018-10-09 06:27:55 -04:00