mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
41,176 Commits 2 Branches 385 Tags
fe40570608f43aade8f4262e9ca55d98a2b169fd
Commit Graph

41176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chuck Atkins
fe40570608 FindSQLite3: Add module to find SQLite3 2018-11-06 15:05:04 -05:00
Brad King
e5d298b8fd Merge topic 'lwyu-hides-link-error' 
85aceda026 cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2546
 2018-11-05 07:50:20 -05:00
Brad King
066db7576d Merge branch 'release-3.13' 2018-11-05 07:49:06 -05:00
Brad King
36280e6157 Merge branch 'custom-command-work-dir-genex' into release-3.13 
Merge-request: !2559
 2018-11-05 07:48:39 -05:00
Brad King
4cd059480a Merge branch 'update-curl' into release-3.13 
Merge-request: !2550
 2018-11-05 07:48:22 -05:00
Brad King
b83420e45d Merge topic 'update-curl' 
c1ad5118de curl: backport upstream fix to 7.62.0 regression
03bf934fbe curl: Modernize tiny test code used for build inside CMake
2b3c1bb9b0 curl: Update build within CMake to account for 7.62 changes
636bcefeab Merge branch 'upstream-curl' into update-curl
9835e90750 curl 2018-10-30 (19667715)
9c6574795c curl: Update script to get curl 7.62.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2550
 2018-11-05 07:43:41 -05:00
Brad King
259292ebcc Merge topic 'custom-command-work-dir-genex' 
98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2559
 2018-11-05 07:42:47 -05:00
Kitware Robot
95894a605e CMake Nightly Date Stamp 2018-11-05 00:01:52 -05:00
Craig Scott
4961092cad Merge branch 'release-3.13' 2018-11-05 12:06:29 +11:00
Craig Scott
03d00d63df Merge branch 'cpack-gen-docs-link' into release-3.13 
Merge-request: !2562
 2018-11-05 12:04:40 +11:00
Craig Scott
aa78b61bbc Merge topic 'cpack-gen-docs-link' 
c12eefa8fd Help: Fix generators link in cpack(1) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2562
 2018-11-04 20:01:08 -05:00
Kitware Robot
112100da90 CMake Nightly Date Stamp 2018-11-04 00:01:06 -04:00
Craig Scott
c12eefa8fd Help: Fix generators link in cpack(1) manual 
Minor rewording around the updated link and extra blank line
added to improve readability and remove a potential
ambiguity around the same area.

Fixes: #18545
 2018-11-04 08:50:22 +11:00
Brad King
98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex 
Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}:
WORKING_DIRECTORY generator expressions, 2018-09-22) the
`WORKING_DIRECTORY` option accepts generator expressions.
Fix support for the case of a leading generator expression
by deferring conversion to an absolute path until after
evaluation of the generator expression.

Fixes: #18543
 2018-11-03 08:39:45 -04:00
Kitware Robot
443c574a7c CMake Nightly Date Stamp 2018-11-03 00:01:09 -04:00
Ben Boeckel
85aceda026 cmNinjaNormalTargetGenerator: don't use || true for link-what-you-use 
With the `|| true`, a linker error before running link-what-you-use
would also use the `|| true` fragment and unconditionally succeed. Just
skip the addition since `--lwyu=` ignores the return value anyways.

Fixes #18524
 2018-11-02 10:25:56 -04:00
Brad King
0730fb5c44 Merge branch 'release-3.12' 2018-11-02 09:25:14 -04:00
Brad King
c1ad5118de curl: backport upstream fix to 7.62.0 regression 
Backport upstream curl commit 2c5ec339ea (Curl_follow: accept
non-supported schemes for "fake" redirects, 2018-11-01) to get
a fix to curl issue 3210, a regression in 7.62.0.
 2018-11-02 08:14:12 -04:00
Brad King
3a77329c40 CMake 3.12.4 v3.12.4 2018-11-02 08:05:07 -04:00
Brad King
bdc5618e18 Merge topic 'FindGDAL-target' 
22ba9b6a32 FindGDAL: set the GDAL_VERSION
525ff0c3bc Tests/FindGDAL: add a test for FindGDAL
87324b9b6a FindGDAL: add an imported target
dfb3f58f79 FindGDAL: Modernize documentation layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2552
 2018-11-02 07:57:54 -04:00
Brad King
a052479a5c Merge topic 'msvc-custom-rc-mt' 
bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}
0033676796 CUDA: Enable RC language on Windows
02f566a559 MSVC: Factor out enable_language(RC) call into helper macro
b601bb6f1c CUDA: Find CMAKE_LINKER on Windows
3eebe28ef4 cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpander

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2424
 2018-11-02 07:57:06 -04:00
Brad King
9578c3f0d1 Merge topic 'check-keywords-only-if-used' 
4babc9058a cmTargetPropCommandBase: check keywords after parsing
45a49ae58a cmTargetPropCommandBase: simplify code path
9f64974f5e cmTargetPropCommandBase: skip property setting if there's nothing to add
4201a11c2b Tests: add tests for empty-value keyword arguments in target_*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2514
 2018-11-02 07:55:14 -04:00
Brad King
08da4f8d70 Merge topic 'FindBoost-exact-version' 
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2543
 2018-11-02 07:53:22 -04:00
Brad King
bacb20a336 Merge branch 'release-3.13' 2018-11-02 07:49:13 -04:00
Brad King
34e011748e Merge branch 'release-3.12' 2018-11-02 07:48:59 -04:00
Brad King
c384fc3ca4 Merge topic 'server-file-monitor-check' 
eb52529ff4 server: Fix assertion failure on directory paths in file monitor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2556
 2018-11-02 07:48:34 -04:00
Kitware Robot
fa5e5550f3 CMake Nightly Date Stamp 2018-11-02 00:01:13 -04:00
Ben Boeckel
22ba9b6a32 FindGDAL: set the GDAL_VERSION 2018-11-01 13:16:37 -04:00
Ben Boeckel
525ff0c3bc Tests/FindGDAL: add a test for FindGDAL 2018-11-01 13:16:37 -04:00
Ben Boeckel
87324b9b6a FindGDAL: add an imported target 2018-11-01 13:16:36 -04:00
Brad King
dfb3f58f79 FindGDAL: Modernize documentation layout 2018-11-01 13:16:36 -04:00
Brad King
a567f533db Merge branch 'server-file-monitor-check' into release-3.13 
Merge-request: !2556
 2018-11-01 09:02:41 -04:00
Brad King
4ccf278f5b Merge branch 'server-file-monitor-check' into release-3.12 
Merge-request: !2556
 2018-11-01 09:02:30 -04:00
Brad King
03bf934fbe curl: Modernize tiny test code used for build inside CMake 
Drop unused code.  Report the error message on failure.
Format the source file using clang-format.
 2018-11-01 08:55:50 -04:00
Brad King
707ac6aab6 Merge branch 'release-3.13' 2018-11-01 07:38:54 -04:00
Brad King
ce45effe13 Merge branch 'release-3.12' 2018-11-01 07:38:08 -04:00
Brad King
133465a0e5 Merge topic 'FindProtobuf-threads' 
03454b0d0d FindProtobuf: Add missing link dependencies on threads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2551
 2018-11-01 07:37:30 -04:00
Brad King
d955b4f753 Merge topic 'fix-custom-target-with-csharp' 
9040df31e2 Merge branch 'backport-fix-custom-target-with-csharp'
1acd1c2b50 CSharp: Fix regression in VS project type selection for custom target
a56edad6d6 CSharp: Fix regression in VS project type selection for custom target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2549
 2018-11-01 07:36:39 -04:00
Vladimir Penev
eb52529ff4 server: Fix assertion failure on directory paths in file monitor 
Fixes: #18532
 2018-11-01 07:25:17 -04:00
Kitware Robot
75b85133d8 CMake Nightly Date Stamp 2018-11-01 00:01:09 -04:00
Brad King
8f043068d5 Merge branch 'FindProtobuf-threads' into release-3.13 
Merge-request: !2551
 2018-10-31 10:29:14 -04:00
Brad King
03454b0d0d FindProtobuf: Add missing link dependencies on threads 
Protobuf headers have dependencies on threads.  On UNIX platforms this
requires linking to a threads library.  We've long done this in the
`Protobuf_LIBRARIES` result variable.  However, the imported targets
added by commit v3.9.0-rc1~81^2~2 (FindProtobuf: add targets,
2017-05-17) and commit v3.9.0-rc1~68^2 (FindProtobuf: Rename imported
targets to match upstream names, 2017-05-22) were missing a dependency
on threads.

Add the dependency to the imported targets, and to the variables
`Protobuf_LITE_LIBRARIES` and `Protobuf_PROTOC_LIBRARIES`.  While this
did not seem to matter in practice for a long time, protobuf 3.6 throws
exceptions in some cases when threads are missing.

Fixes: #18533
 2018-10-31 10:24:01 -04:00
Brad King
2b3c1bb9b0 curl: Update build within CMake to account for 7.62 changes 2018-10-31 09:50:04 -04:00
Brad King
636bcefeab Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-10-30 (19667715)
 2018-10-31 09:46:23 -04:00
Curl Upstream
9835e90750 curl 2018-10-30 (19667715) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 196677150f711a96c38ed123e621f1d4e995b2e5 (curl-7_62_0).
 2018-10-31 09:41:28 -04:00
Brad King
9c6574795c curl: Update script to get curl 7.62.0 2018-10-31 09:40:47 -04:00
Brad King
9040df31e2 Merge branch 'backport-fix-custom-target-with-csharp' 2018-10-31 09:38:01 -04:00
Brad King
3065a8a793 Merge branch 'fix-custom-target-with-csharp' into release-3.13 
Merge-request: !2549
 2018-10-31 09:36:38 -04:00
Brad King
609bdd126d Merge branch 'backport-fix-custom-target-with-csharp' into release-3.12 
Merge-request: !2549
 2018-10-31 09:35:19 -04:00
Brad King
7f68e4a163 Merge branch 'release-3.13' 2018-10-31 09:34:33 -04:00