Commit Graph

40865 Commits

Author SHA1 Message Date
Brad King
fd0e40f166 Merge branch 'backport-revert-install-code-script-genex' into revert-install-code-script-genex 2018-10-11 08:14:48 -04:00
Brad King
e2dd6ac977 Merge topic 'remove-AddCompileDefinitions'
8f076acdb0 cmLocalGenerator: Remove AddCompileDefinitions method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2470
2018-10-11 07:44:03 -04:00
Brad King
9b20d6568a Merge branch 'release-3.13' 2018-10-11 07:42:35 -04:00
Brad King
4f289cdc1e Merge topic 'vs-cuda-pdb'
faf3d7d224 VS: Add workaround for CUDA compiler PDB location with space
592064e026 VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+
fb378fc4d7 Tests: Fix Cuda test project names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2473
2018-10-11 07:41:42 -04:00
Brad King
b7cba6ba00 Merge topic 'cmake_policy-get_warning'
0d988f98e5 cmake_policy: Add undocumented GET_WARNING command
f9f96598df Help: Convert FindOpenGL documentation to block comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2472
2018-10-11 07:41:06 -04:00
Brad King
7d2ee4cb98 Merge topic 'install-subdirectory-order'
b56f2db87a Testing: Add test for CMP0082
fc8955e889 add_subdirectory: Run subdirectory install rules in correct order
514f0b572e Testing: Update hard-coded line numbers to [0-9]+ in some tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2434
2018-10-11 07:37:59 -04:00
Brad King
7a0f516ecd Merge topic 'FindwxWidgets-optional'
045b0beae1 FindwxWidgets: implement detailed components status on Windows
0813581859 FindwxWidgets: honor OPTIONAL_COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2447
2018-10-11 07:33:39 -04:00
Brad King
2e1fe8fabe Merge topic 'ctest-done'
a6e0158712 ctest_submit: Add support for a "Done" part
f460bbd4c8 ctest_submit: Refactor file list to use a vector instead of a set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !2405
2018-10-11 07:32:54 -04:00
Brad King
0f48fbaa72 install: Revert CODE,SCRIPT support for generator expressions
Revert commit v3.13.0-rc1~441^2 (install: Teach CODE,SCRIPT modes to
evaluate generator expressions, 2018-05-29).  Unfortunately it has
been found to break existing code in a real project, e.g.

    install(CODE [[
        message("$<FOOBAR>")
    ]])

Address this regression by reverting support for the 3.13 release
series.  Support can be restored later with a policy for compatibility.

Issue: #15785
Fixes: #18435
2018-10-11 07:05:55 -04:00
Kitware Robot
8563e29c81 CMake Nightly Date Stamp 2018-10-11 00:01:09 -04:00
Brad King
bcfb245703 Merge branch 'vs-cuda-pdb' into release-3.13
Merge-request: !2473
2018-10-10 13:41:44 -04:00
Brad King
faf3d7d224 VS: Add workaround for CUDA compiler PDB location with space
CUDA Toolkit Visual Studio Integration for version 9.2 and above does
honor the `ClCompile.ProgramDataBaseFileName` field when telling `nvcc`
how to invoke `cl`.  Unfortunately it does not quote paths with spaces
correctly:

    -Xcompiler "... /Fd"C:\path\with space\foo.pdb" ..."

Work around this by converting the PDB location to a relative path.
Likely we could always do this, but for now make a minimal change
just for CUDA support.

Fixes: #18440
2018-10-10 13:29:47 -04:00
Brad King
592064e026 VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+
The workaround added by commit v3.12.0-rc1~227^2 (VS: Add workaround for
CUDA compiler PDB location, 2018-04-13) is not necessary on CUDA 9.2+
because the CUDA Toolkit Visual Studio Integration has fixed the
original bug and forwards the `ProgramDataBaseFileName` to the host
compiler itself.  Make the workaround conditional on the CUDA version.

Issue: #18440
2018-10-10 13:29:47 -04:00
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