Commit Graph

41419 Commits

Author SHA1 Message Date
Brad King 4e0c75b78f Merge topic 'clang-tidy'
5731ec30f0 clang-tidy: fix warnings from version 7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2636
2018-11-21 07:42:32 -05:00
Brad King 2b427c2fad Merge topic 'FindGIF-modernize'
74cc42e937 Help: Add notes for topic 'FindGIF-modernize'
6962a41e6b FindGIF: Add test
5bc64fe6c2 FindGIF: Modernize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2632
2018-11-21 07:41:27 -05:00
Brad King 74cc42e937 Help: Add notes for topic 'FindGIF-modernize' 2018-11-21 07:39:58 -05:00
Brad King 8b83d1fdff Merge topic 'find-boost-test-version'
19d92d5e6e FindBoost: provide the version in x.y.z format
186f69cf26 FindBoost: test version variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2638
2018-11-21 07:37:11 -05:00
Brad King 3d48c5404c Merge branch 'release-3.13' 2018-11-21 07:35:52 -05:00
Brad King a586b60129 Merge topic 'fortran-submodule-case'
ead16adfc8 Fortran: Fix module dependency scanning with upper-case SUBMODULE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2644
2018-11-21 07:34:53 -05:00
Kitware Robot 3804122ab2 CMake Nightly Date Stamp 2018-11-21 00:01:04 -05:00
Craig Scott ec43aca703 Merge topic 'doc-module-doc-syntax'
8369e3e782 Help/dev: Modernize module example in the CMake Documentation Guide
664d6178d8 Help: Modernize example find module docs in cmake-developer(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2621
2018-11-20 16:48:45 -05:00
Maximilian Heinzler 6962a41e6b FindGIF: Add test
This tests whether GIFLIB can be found and the linker works. For newer
versions (>=5) it also tests if the version was parsed correctly.
2018-11-20 21:07:03 +01:00
Maximilian Heinzler 5bc64fe6c2 FindGIF: Modernize
This brings the module up to the current find module standards by adding
the GIF_INCLUDE_DIRS variable and the target GIF::GIF. It also updates
the documentation style to that of similar modules.
2018-11-20 21:07:03 +01:00
Brad King 8068850fcc Merge branch 'fortran-submodule-case' into release-3.13
Merge-request: !2644
2018-11-20 14:19:20 -05:00
Brad King ead16adfc8 Fortran: Fix module dependency scanning with upper-case SUBMODULE
The lexical token expression added by commit v3.7.0-rc1~73^2~1 (Fortran:
Add support for submodule syntax in dependency scanning, 2016-09-05)
has a typo and does not match upper-case `B` in `SUBMODULE`.  Fix it.

Fixes: #18595
2018-11-20 14:16:26 -05:00
Brad King ea52ec9420 Merge branch 'release-3.13' 2018-11-20 11:45:54 -05:00
Ben Boeckel 19d92d5e6e FindBoost: provide the version in x.y.z format 2018-11-20 10:45:24 -05:00
Ben Boeckel 186f69cf26 FindBoost: test version variables 2018-11-20 10:45:24 -05:00
Regina Pfeifer 5731ec30f0 clang-tidy: fix warnings from version 7
Fix some warnings that are new since clang-tidy version 4, and update
`.clang-tidy` to suppress the rest.
2018-11-20 10:36:08 -05:00
Brad King 05a2ca7f87 CMake 3.13.0 v3.13.0 2018-11-20 09:31:28 -05:00
Brad King a09274c6ec Merge branch 'release-3.13' 2018-11-20 09:30:24 -05:00
Brad King aed259ac41 Merge topic 'genex-in_list-empty-args'
b5f8113ca7 Genex: Add policy to handle empty list items in $<IN_LIST:...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2569
2018-11-20 09:29:44 -05:00
Brad King e653f46677 Merge topic 'blas-pkgcfg'
a3c31effed FindBLAS: Restore BLAS_FOUND when found using pkgconfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2631
2018-11-20 09:26:31 -05:00
Brad King fc366d2594 Merge topic 'FindPython-lib-arch'
c24f29c664 FindPython: Ensure config tool matches library architecture

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eric Noulard <eric.noulard@gmail.com>
Merge-request: !2624
2018-11-20 09:25:48 -05:00
Brad King 4b94f3420c Merge topic 'irsl-ucrt-version'
01c7d9ce86 IRSL: Detect versioned Windows Universal CRT directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2637
2018-11-20 09:25:03 -05:00
Brad King 8369e3e782 Help/dev: Modernize module example in the CMake Documentation Guide 2018-11-20 21:03:01 +11:00
Brad King 664d6178d8 Help: Modernize example find module docs in cmake-developer(7) 2018-11-20 21:03:01 +11:00
Kitware Robot d851a8b457 CMake Nightly Date Stamp 2018-11-20 00:01:05 -05:00
Kyle Edwards b5f8113ca7 Genex: Add policy to handle empty list items in $<IN_LIST:...>
The old behavior of $<IN_LIST:...> is inconsistent with that of
if(IN_LIST), in that it does not find an empty search item even if
the list contains empty items. This change adds a new policy to
correctly handle empty items and make the behavior more consistent
with if(IN_LIST).

Fixes: #18556
2018-11-19 17:02:06 -05:00
Brad King a5241cc3a7 Merge branch 'blas-pkgcfg' into release-3.13
Merge-request: !2631
2018-11-19 15:47:59 -05:00
Martin von Gagern a3c31effed FindBLAS: Restore BLAS_FOUND when found using pkgconfig
Refactoring in commit v3.12.0-rc1~92^2 (FindPkgConfig: export the list
of found libraries also as variable, 2018-05-11) dropped use of FPHSA
to set `BLAS_FOUND`.  Set it explicitly instead.
2018-11-19 15:47:20 -05:00
Brad King 3e1c361afa Merge branch 'FindPython-lib-arch' into release-3.13
Merge-request: !2624
2018-11-19 15:37:05 -05:00
Marc Chevrier c24f29c664 FindPython: Ensure config tool matches library architecture 2018-11-19 15:36:26 -05:00
Brad King d3fa2e7400 Merge branch 'irsl-ucrt-version' into release-3.13
Merge-request: !2637
2018-11-19 13:32:13 -05:00
Brad King 01c7d9ce86 IRSL: Detect versioned Windows Universal CRT directories
Windows SDK version 10.0.17763.0 now places the uCRT libraries in a
versioned directory.

Fixes: #18603
2018-11-19 13:31:40 -05:00
Brad King 1dc85a6652 Merge branch 'release-3.13' 2018-11-19 10:47:42 -05:00
Brad King 9e1ee3a7c9 Merge topic 'backport-configure_file-canonical-deps'
57701227d6 configure_file: canonicalize input and output path in dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2635
2018-11-19 10:47:04 -05:00
Brad King e593161bd5 Merge branch 'backport-configure_file-canonical-deps' into release-3.13
Merge-request: !2635
2018-11-19 10:14:26 -05:00
Frank Benkstein 57701227d6 configure_file: canonicalize input and output path in dependencies
Represent the input file path internally in canonical form.  Otherwise
multiple `configure_file` calls that share the same input file but specify
it relative to different directories (e.g. via `../`) result in multiple
copies of the dependency on the rule to re-run CMake.  This causes the
Ninja generator to emit duplicate phony build statements for these
dependencies, which generates an error with `-w dupbuild=err`, which
will be default in Ninja 1.9.

Also canonicalize the output path for consistency.

Add a test case.

Fixes: #18584
2018-11-19 10:11:12 -05:00
Brad King 8866f63f60 Merge topic 'macro_doc_cleanups'
b82526c654 Help: Minor grammar and typo corrections for macro command docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2622
2018-11-19 09:59:02 -05:00
Brad King b7b2ce56a7 Merge topic 'findx11-imported-targets'
bced9d5e56 Tests/FindX11: add a test
a7d2ffb232 FindX11: add imported targets
40b3dba529 FindX11: require Freetype and Fontconfig for Xft
cc96249e2e FindX11: remove local variable from the advanced list
99489d9f10 FindX11: find Xext.h
b8b598061a FindX11: match variables with library names
6079a0d00f FindX11: fix some formatting in the documentation
3c54955d0d FindX11: use `list(APPEND)` for clearer code
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2604
2018-11-19 09:57:46 -05:00
Brad King d9d8816f39 Merge topic 'pie-link-options'
b10f7ac534 CMP0083: fix warning message on try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2619
2018-11-19 09:57:13 -05:00
Brad King 95a735116f Merge topic 'ctest-stdin'
86e8315482 CTest: Restore inheritance of stdin by test processes
bdec3bd896 Tests: Teach RunCMake infrastructure to optionally provide stdin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2618
2018-11-19 09:52:07 -05:00
Marc Chevrier b10f7ac534 CMP0083: fix warning message on try_compile
Fixes: #18593
2018-11-19 10:56:02 +01:00
Kitware Robot 61e3ceda21 CMake Nightly Date Stamp 2018-11-19 00:01:04 -05:00
Kitware Robot 6f5cdc0c83 CMake Nightly Date Stamp 2018-11-18 00:01:11 -05:00
Kitware Robot be9ad8279a CMake Nightly Date Stamp 2018-11-17 00:01:03 -05:00
Kitware Robot 7aa41095fd CMake Nightly Date Stamp 2018-11-16 00:01:04 -05:00
Craig Scott b82526c654 Help: Minor grammar and typo corrections for macro command docs
Follow-up to !2616, specifically commit 22cca9b810
2018-11-16 08:01:55 +11:00
Brad King b324743229 Merge topic 'cpack'
a26ac919ef Help: Explain interaction of cpack(1) and CPack.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2617
2018-11-15 13:49:58 -05:00
Ben Boeckel bced9d5e56 Tests/FindX11: add a test 2018-11-15 13:08:18 -05:00
Joachim Wuttke (l) a26ac919ef Help: Explain interaction of cpack(1) and CPack.
In particular, make clear that package/installer generators
are not the makefile generators of the cmake command.

Also insert sections in CPack doc, and capitalize section titles.
2018-11-15 16:50:52 +01:00
Brad King 1763f04281 Merge topic 'test-WriteBasicConfigVersionFile'
f3a381115f Tests: Simplify RunCMake.WriteBasicConfigVersionFile
0dbcc1afbf Tests: Factor out RunCMake.WriteBasicConfigVersionFile test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2612
2018-11-15 10:41:07 -05:00