Commit Graph

38118 Commits

Author SHA1 Message Date
Craig Scott
b311b87518 Merge topic 'check_fixtures_before_exe_existence'
fbe91dba CTest: Check failed fixture dependencies before test command and args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1526
2017-11-29 15:09:58 -05:00
Brad King
5def40891f Merge branch 'release-3.10' 2017-11-29 08:40:00 -05:00
Brad King
c07b18d883 Merge topic 'CodeBlocks-custom-compiler-id'
e04f1d1b CodeBlocks: add option for the CB compiler ID

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1512
2017-11-29 08:32:26 -05:00
Brad King
71c28bddba Merge topic 'aix-threads'
4ff89fb6 AIX: Add -pthread flag to enable std::thread with GCC
6e613ff3 bootstrap: Add infrastructure to detect threading flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1535
2017-11-29 08:32:00 -05:00
Brad King
d5cad74078 Merge topic 'clang-cl-fix'
f969f1a9 Clang: Do not mistake clang-cl 6.0 for GNU-like clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1522
2017-11-29 08:29:36 -05:00
Brad King
caffddd620 Merge topic 'CheckIncludeFiles-language-CXX'
b31d5e1d CheckIncludeFiles: improve warning for missing argument
1f1c2a9f CheckIncludeFiles: clean up documentation of new features
c8609992 Help: Add notes for topic 'CheckIncludeFiles-language-CXX'
ea1bb902 CheckIncludeFiles: add unit tests
7669695a CheckIncludeFiles: extend to allow a LANGUAGE argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1464
2017-11-29 08:26:05 -05:00
Brad King
9e961930ee Merge topic 'win-clang-debug'
458c589f FindBoost: Add Windows ABI tag for Clang debug
00e39a4a FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1529
2017-11-29 08:23:11 -05:00
Brad King
04f869bb46 Merge topic 'cppcheck_testdriver'
72d3161a TestDriver: fix style-'variableScope' cppcheck warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1518
2017-11-29 08:22:15 -05:00
Brad King
89a628e28f Merge topic 'fortran-compiler-launcher'
f19c70c3 Fortran: Add option to run the compiler through launcher tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1517
2017-11-29 08:21:44 -05:00
Brad King
d4805dd47b Merge topic 'cuda-implicit-include-dirs'
2f72573a CUDA: Treat /usr/include as an implicit include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1528
2017-11-29 08:20:45 -05:00
Brad King
cd5002579d Merge topic 'GNUInstallDirs-update-link'
24e2bc42 GNUInstallDirs: Update link to 64-bit ABI documents

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1527
2017-11-29 08:19:28 -05:00
Kitware Robot
a4ddc7357a CMake Nightly Date Stamp 2017-11-29 00:01:04 -05:00
Craig Scott
fbe91dba6a CTest: Check failed fixture dependencies before test command and args 2017-11-29 07:27:20 +11:00
Brad King
4ff89fb608 AIX: Add -pthread flag to enable std::thread with GCC 2017-11-28 11:24:26 -05:00
Brad King
6e613ff399 bootstrap: Add infrastructure to detect threading flags
In our loop to detect -std flags, add another layer to detect
threading flags.
2017-11-28 11:23:36 -05:00
Brad King
79ad921a38 Merge branch 'clang-cl-fix' into release-3.10
Merge-request: !1522
2017-11-28 11:09:53 -05:00
İsmail Dönmez
f969f1a9ce
Clang: Do not mistake clang-cl 6.0 for GNU-like clang
The check added by commit v3.10.0-rc2~2^2 (Clang: Diagnose unsupported
GNU-like clang targeting MSVC ABI, 2017-10-10) is incorrectly detecting
clang-cl 6.0 as GNU-like.  Currently cmake is testing if the clang
compiler accepts `--version` to see if it accepts GNU style flags.
However, with the latest llvm snapshot this also works for clang-cl:

    > clang-cl --version
    clang version 6.0.0 (trunk)
    Target: x86_64-pc-windows-msvc
    Thread model: posix
    InstalledDir: C:\Program Files\LLVM\bin

So instead we should use the `/?` flag which fails with clang but
works with clang-cl:

    > clang-cl /? &> /dev/null; echo $?
    0
    > clang /? &> /dev/null; echo $?
    1

Fixes: #17518
2017-11-28 17:08:33 +01:00
Kitware Robot
8b5ae1c1d3 CMake Nightly Date Stamp 2017-11-28 00:03:39 -05:00
Melven Roehrig-Zoellner
e04f1d1b47 CodeBlocks: add option for the CB compiler ID
CodeBlocks uses his own compiler ID string which may differ from
CMAKE_<LANG>_COMPILER_ID. In particular CodeBlocks supports a large
number of different compiler configurations (with different IDs)
This commit adds a cache variable "CMAKE_CODEBLOCKS_COMPILER_ID",
so the user might adjust it when needed.
2017-11-27 14:41:54 -05:00
Roger Leigh
458c589fe3 FindBoost: Add Windows ABI tag for Clang debug
Thanks to Walter Pearce for this suggestion.

Fixes: #17505
2017-11-27 13:49:01 -05:00
Roger Leigh
00e39a4afc FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler 2017-11-27 13:48:22 -05:00
Brad King
93e7eb7bc5 Merge branch 'cuda-implicit-include-dirs' into release-3.10
Merge-request: !1528
2017-11-27 10:26:52 -05:00
Brad King
2f72573a62 CUDA: Treat /usr/include as an implicit include directory
We already do this for C and C++.

Fixes: #17512
2017-11-27 10:24:13 -05:00
Brad King
24e2bc4219 GNUInstallDirs: Update link to 64-bit ABI documents
Suggested-by: Chris Coutinho <chrisbcoutinho@gmail.com>
Fixes: #17503
2017-11-27 10:01:35 -05:00
Brad King
65f21a7ead Merge branch 'release-3.10' 2017-11-27 09:03:44 -05:00
Brad King
1882ba2e05 Merge topic 'extend-compile-language-genex'
2ae880fa Genex: Enable COMPILE_LANGUAGE for COMPILE_OPTIONS with Visual Studio
2b7d59f3 Genex: Enable COMPILE_LANGUAGE for file(GENERATE) with Visual Studio
0f6f7c8a Genex: Fix COMPILE_LANGUAGE messages to allow file(GENERATE) with Xcode
c5a82d0f Tests: Decouple COMPILE_LANGUAGE in file(GENERATE) from COMPILE_OPTIONS
25773650 Tests: Remove unnecessary result files from RunCMake.File_Generate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !1511
2017-11-27 09:00:44 -05:00
Brad King
b67762ff3c Merge topic 'hardcoded-path-removal'
a62d50ec Modules: Replace coded PATHS with PATH_SUFFIXES
fd56d6a8 FindMPEG,2: Update to current libmpeg2 behavior
5f382cd8 FindPike: Update names and paths
6720807d FindAVIFile: Replace PATHS with updated suffixes
f88ef9a9 Modules: Remove paths set as global Unix prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1502
2017-11-27 08:53:04 -05:00
Brad King
784e429d1f Merge topic 'iwyu-workaround'
e5fdbcc9 IWYU: Add more mappings for std::__decay_and_strip

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1516
2017-11-27 08:52:37 -05:00
Brad King
08f66764b3 Merge topic 'server-target-isGeneratorProvided'
afd9a339 server: return whether or not a target is generator provided

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1475
2017-11-27 08:52:06 -05:00
Brad King
0c1912e3e5 Merge topic 'serverFixTestDiscovery'
fe2c2b0f server: ctestInfo fix to return all tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1479
2017-11-27 08:51:35 -05:00
Kitware Robot
b1d3fb7fba CMake Nightly Date Stamp 2017-11-27 00:01:15 -05:00
Kitware Robot
53c6da8b9e CMake Nightly Date Stamp 2017-11-26 00:01:10 -05:00
Kitware Robot
c55fe43fc1 CMake Nightly Date Stamp 2017-11-25 00:01:04 -05:00
David Adam
b31d5e1dfd CheckIncludeFiles: improve warning for missing argument 2017-11-24 15:54:00 +08:00
David Adam
1f1c2a9fdf CheckIncludeFiles: clean up documentation of new features 2017-11-24 15:53:54 +08:00
Kitware Robot
eea976e930 CMake Nightly Date Stamp 2017-11-24 00:01:22 -05:00
Kitware Robot
e1243a50a7 CMake Nightly Date Stamp 2017-11-23 00:01:05 -05:00
Sylvain Joubert
72d3161a7f TestDriver: fix style-'variableScope' cppcheck warning
When applied on a user project, cppcheck complains that the 'test_name'
variable could have a reduced scope.
2017-11-22 19:54:00 +01:00
Craig Scott
51ccfaacb8 Merge topic 'WriteBasicConfigVersionFile_SameMinorVersion'
d18ff3a5 WriteBasicConfigVersionFile: Fix messages in ExactVersion tests
16a93de0 WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Claudio <claudio.fantacci@gmail.com>
Merge-request: !1507
2017-11-22 07:29:33 -05:00
Kitware Robot
7dbeb3ac5c CMake Nightly Date Stamp 2017-11-22 00:02:20 -05:00
Brad King
f19c70c3d2 Fortran: Add option to run the compiler through launcher tools
Add a `Fortran_COMPILER_LAUNCHER` target property like those added for C
and CXX by commit v3.4.0-rc1~450^2 (Add options to launch the compiler
through tools like ccache or distcc, 2015-06-04) and CUDA by commit
v3.10.0-rc1~531^2 (CUDA: Add option to run the compiler through launcher
tools, 2017-06-09).

Fixes: #17499
2017-11-21 14:44:01 -05:00
Brad King
e5fdbcc9da IWYU: Add more mappings for std::__decay_and_strip
IWYU incorrectly classifies this internal STL type as not internal, and
suggests including `<type_traits>` for it.  Work around the problem by
mapping the offending names to a file that we always include.

See include-what-you-use issue 434.
2017-11-21 14:22:40 -05:00
Brad King
baa19f658f Merge topic 'gtest-fix-discovery'
70f9f62d GoogleTest: Fix multiple discovery on same target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1510
2017-11-21 13:00:24 -05:00
Brad King
c2019d7c0c Merge branch 'gtest-fix-discovery' into release-3.10
Merge-request: !1510
2017-11-21 12:05:47 -05:00
Matthew Woehlke
70f9f62da8 GoogleTest: Fix multiple discovery on same target
According to the documentation, tests can be discovered for a target
multiple times by using a different prefix and/or suffix to ensure name
uniqueness. However, while this worked for gtest_add_tests, it did not
work with gtest_discover_tests because the generated file that sets up
the tests was named based only on the target name, and so subsequent
discovery from the same target would clobber earlier discovery.

Fix this by introducing a counter that records how many times discovery
has been used on a target, and use this to generate unique names of the
generated test list files.
2017-11-21 12:05:34 -05:00
Christian Pfeiffer
daeadde888 Merge topic 'irsl-intel-1041-folder'
8e7e7af5 IRSL: Install the 1041 folder for Intel compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1509
2017-11-21 05:56:03 -05:00
Christian Pfeiffer
65c5833858 Merge topic 'findqt4-dirs-fix'
f81d186b FindQt4: Set PLUGINS and IMPORTS dir even if empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1503
2017-11-21 05:55:40 -05:00
Christian Pfeiffer
8f8f118327 Merge topic 'wxwidgets-env-variables'
9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1504
2017-11-21 05:55:12 -05:00
Christian Pfeiffer
e91e69cfb5 Merge topic 'imagemagick-6-freebsd-names'
35b8a26b FindImageMagick: Add more library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1505
2017-11-21 05:54:50 -05:00
Daniele E. Domenichelli
d18ff3a5c6 WriteBasicConfigVersionFile: Fix messages in ExactVersion tests 2017-11-21 10:09:15 +01:00