Commit Graph

40889 Commits

Author SHA1 Message Date
Brad King 5346c784d5 Merge branch 'release-3.13' 2018-10-15 13:04:32 -04:00
Brad King f225d79881 Merge topic 'update_debug_target_properties'
86921f0264 Help: document CMAKE_DEBUG_TARGET_PROPERTIES support for LINK properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2480
2018-10-15 13:03:51 -04:00
Brad King 0c1622dca6 Merge topic 'FindPkgConfig-operator-docs'
7f2bc70c5e FindPkgConfig: Document support for > and < operators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2481
2018-10-15 13:03:17 -04:00
Brad King eca87ee811 Merge branch 'update_debug_target_properties' into release-3.13
Merge-request: !2480
2018-10-15 10:21:01 -04:00
Brad King 01fae460be Merge branch 'FindPkgConfig-operator-docs' into release-3.13
Merge-request: !2481
2018-10-15 10:16:18 -04:00
Craig Scott 7f2bc70c5e FindPkgConfig: Document support for > and < operators
This was left out of commit v3.13.0-rc1~14^2 (FindPkgConfig: support
also > and < operators for version compares, 2018-10-02).
2018-10-15 10:14:51 -04:00
Kitware Robot 6c281138a5 CMake Nightly Date Stamp 2018-10-15 00:01:05 -04:00
Kitware Robot f77a9576e5 CMake Nightly Date Stamp 2018-10-14 00:01:05 -04:00
Kitware Robot fd71ad3715 CMake Nightly Date Stamp 2018-10-13 00:01:08 -04:00
Robert Maynard 86921f0264 Help: document CMAKE_DEBUG_TARGET_PROPERTIES support for LINK properties 2018-10-12 09:53:22 -04:00
Brad King 7bacb22955 Merge topic 'cppcheck-exit-code'
3b80cd77fb Fail the build if cppcheck returns a non-zero exit code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2459
2018-10-12 08:17:58 -04:00
Brad King 1cfe2442c4 Merge topic 'find_libinput'
f76047f34a FindLibinput: Add module to find libinput

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2420
2018-10-12 08:15:25 -04:00
Brad King 0d8a4ded12 Merge branch 'release-3.13' 2018-10-12 08:12:49 -04:00
Brad King ced094e22e Merge topic 'revert-install-code-script-genex'
fd0e40f166 Merge branch 'backport-revert-install-code-script-genex' into revert-install-code-script-genex
0f48fbaa72 install: Revert CODE,SCRIPT support for generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2474
2018-10-12 08:11:49 -04:00
Brad King 02eb3c302a Merge topic 'FindPython-updates'
e23c41ba78 FindPython*: Add missing registry paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2476
2018-10-12 08:09:37 -04:00
Brad King e9eaf0f262 Merge topic 'FindBoost-mt-release'
9c75922745 FindBoost: Search for -mt variant of release libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2475
2018-10-12 07:53:00 -04:00
Kitware Robot aeb24db554 CMake Nightly Date Stamp 2018-10-12 00:01:08 -04:00
Brad King 769fc9c4de Merge branch 'FindBoost-mt-release' into release-3.13
Merge-request: !2475
2018-10-11 14:18:49 -04:00
Mario Bielert 9c75922745 FindBoost: Search for -mt variant of release libs
We were searching the `-mt` variant for debug libs only.
It makes sense for release libs too.
2018-10-11 14:16:34 -04:00
Brad King c9b7cd8ed7 Merge branch 'FindPython-updates' into release-3.13
Merge-request: !2476
2018-10-11 14:14:01 -04:00
Marc Chevrier e23c41ba78 FindPython*: Add missing registry paths
Fixes: #18443
2018-10-11 14:13:31 -04:00
Frederik Gladhorn f76047f34a FindLibinput: Add module to find libinput
This module is inspired by one from KDE's KWin.
2018-10-11 10:43:45 -04:00
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 d26f5b6889 Merge branch 'backport-revert-install-code-script-genex' into release-3.13
Merge-request: !2474
2018-10-11 08:11:21 -04:00
Harald Brinkmann 3b80cd77fb Fail the build if cppcheck returns a non-zero exit code
This allows the build failure to be tuned with cppcheck's
options --error-exitcode=<n> and --exitcode-suppressions=<file>.
2018-10-11 07:56:05 -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