Commit Graph

38090 Commits

Author SHA1 Message Date
Deniz Bahadir
8112059ee7 target_link_libraries: Simplify implementation and add comments.
The implementation of `target_link_libraries` did grow over the years
when new features where added. This commit cleans up the implementation
and adds comments to better document its intention.

The behavior of `target_link_libraries` itself is left untouched.
2017-11-30 17:35:25 +01:00
Deniz Bahadir
b0e2f1415e target_link_libraries: Slightly fix some error-messages.
Some error-messages are slightly adjusted to better tell what
invocation would be correct instead. Tests are adjusted accordingly.
2017-11-29 17:01:47 +01:00
Deniz Bahadir
85457b63c8 target_link_libraries: Return earlier on some error. 2017-11-29 17:00:56 +01: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
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
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
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
Daniele E. Domenichelli
16a93de0a8 WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY option 2017-11-21 09:27:07 +01:00
Kitware Robot
9698eef88a CMake Nightly Date Stamp 2017-11-21 00:01:05 -05:00
Justin Goshi
afd9a339a1 server: return whether or not a target is generator provided
Some generators auto-generate targets. For example VS generators create
the ALL_BUILD target. Add the ability to mark targets as generator
provided and return that info through cmake-server codemodel.
2017-11-20 14:29:50 -05:00
Brad King
2ae880fa8f Genex: Enable COMPILE_LANGUAGE for COMPILE_OPTIONS with Visual Studio
Since commit v3.9.0-rc4~3^2~1 (VS: Fix target_compile_options for CUDA,
2017-06-21), the evaluation of `COMPILE_LANGUAGE` receives the proper
language.  The set of compile flags used for a target's C and C++
sources is based on the linker language.  By default this is always the
C++ flags if any C++ sources appear in the target, and otherwise the C
flags.  Therefore we can define the `COMPILE_LANGUAGE` generator
expression in `COMPILE_OPTIONS` to match the selected language.

This is not exactly the same as for other generators, but is the best VS
can do.  It is also sufficient for many use cases since the set of
allowed flags for C and C++ is almost the same in Visual Studio.
Furthermore, since the VS generator moves many of the flags to
declarative `.vcxproj` elements, it will automatically avoid passing
C++ flags for C sources.

Issue: #17435
2017-11-20 13:51:25 -05:00
Brad King
4d52b46c70 Merge topic 'tidy-sha1-comment'
08353542 clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1497
2017-11-20 13:37:50 -05:00
Brad King
7ec847395d Merge branch 'release-3.10' 2017-11-20 11:23:49 -05:00
Christian Pfeiffer
8e7e7af5c8 IRSL: Install the 1041 folder for Intel compilers
The presence of the `1041` seems to solely depend on whether a given
Intel compiler release was available in Japanese or not. Install it if
it is present and silently ignore it otherwise.

Example: The Intel 2018.0 release did not ship it, but the 2018.1
compilers have it.
2017-11-20 16:35:02 +01:00
Christian Pfeiffer
a62d50ec56 Modules: Replace coded PATHS with PATH_SUFFIXES
Some modules assume that `/usr` and `/usr/local` are the only
`CMAKE_PREFIX_PATH` entries and explicitly enumerate all paths instead
of using `PATH_SUFFIXES` and relying on the dynamic set of prefix paths.
This commit attempts to rectify that behavior.
2017-11-20 16:29:25 +01:00
Christian Pfeiffer
fd56d6a8e6 FindMPEG,2: Update to current libmpeg2 behavior 2017-11-20 16:29:00 +01:00
Brad King
7746fdb2fe CMake 3.10.0 v3.10.0 2017-11-20 10:27:59 -05:00
Brad King
c7f175d637 Merge branch 'release-3.10' 2017-11-20 10:26:01 -05:00
Christian Pfeiffer
5f382cd822 FindPike: Update names and paths 2017-11-20 16:24:43 +01:00
Brad King
d5624a40f2 Merge topic 'fix-cmake-server-bad-buffering'
01c42155 server: Fix regression in partial message handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: jdavidberger <j.david.berger@gmail.com>
Merge-request: !1498
2017-11-20 10:23:48 -05:00
Christian Pfeiffer
6720807d57 FindAVIFile: Replace PATHS with updated suffixes 2017-11-20 16:23:12 +01:00
Christian Pfeiffer
f88ef9a9b8 Modules: Remove paths set as global Unix prefixes
This commit removes hardcoded paths that are already given in the
platform files or in `UnixPath` on a global level.
2017-11-20 16:21:49 +01:00
Brad King
08ce62bee5 Merge topic 'autogen-rcc-custom-command'
40434631 Autogen: Use integers instead of strings for the Qt version
be11a852 Autogen: Use project relative paths in rcc custom command comment
ab9d5896 Autogen: Detect rcc feature once during configuration
2a85b5ac Autogen: Make cmQtAutoGeneratorInitializer an instantiable class
75819b86 Autogen: Add and use cmQtAutoGenerator base class
27ed3b35 Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUic
1cd285fe Autogen: Remove rcc code from cmQtAutoGenerators
a87f82e0 Autogen: Switch to use custom commands for RCC
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1494
2017-11-20 10:13:11 -05:00
Brad King
66b37132b6 Merge topic 'cpack-minor-cleanup-and-tests-extension'
325f34d1 CPack tests: add possibility for expecting config developer warnings
176281e1 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX
cf0c2599 CPack: set variable commands in lower case
2ff906b3 CPack: documentation typo fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1499
2017-11-20 10:09:14 -05:00
Brad King
345ae8d0e1 Merge topic 'ctest-chrono'
5fd979a8 CTest: adopt std::chrono::system_clock

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1487
2017-11-20 09:50:02 -05:00
Brad King
1da5a6ea39 Merge topic 'cuda-sep-comp-var'
00e13993 CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Korsunsky <a.korsunsky@gmail.com>
Merge-request: !1495
2017-11-20 09:45:58 -05:00
Brad King
967ba2e180 Merge topic 'iwyu-suppress-clang-warnings'
be592b23 IWYU: Suppress warnings from the internal Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1496
2017-11-20 09:44:48 -05:00
Brad King
dc24013bfc Merge topic 'perf-source-lookup'
4a6348db Performance: Improve efficiency of source file lookup in cmMakefile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1421
2017-11-20 09:44:19 -05:00
Brad King
9100ea1d82 Merge topic 'FindOpenGL-glvnd-policy'
2ea17412 FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !1491
2017-11-20 09:43:27 -05:00
Brad King
b0c2cd47f0 Merge topic 'serverBugFixHasInstallRule'
cb7d0a80 server: project has install rule bug fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1489
2017-11-20 09:42:06 -05:00
Brad King
521cb89e02 Merge topic 'vs-source-group-order'
f26009dd VS: Order .vcxproj.filters files deterministically
c871446a cmSourceGroup: Return strings from GetName and GetFullName

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1484
2017-11-20 09:41:09 -05:00
Brad King
a347de186c Merge branch 'fix-cmake-server-bad-buffering' into release-3.10
Merge-request: !1498
2017-11-20 09:30:04 -05:00