1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Commit Graph

1577 Commits

Author SHA1 Message Date
Brad King
13467f1dbd Utilities/Release: Make README docker examples more readable
Hard-code them for `linux/x86_64` instead of using an `<arch>`
placeholder.  Update the prose to mention the platform/arch explicitly.
2020-05-05 14:45:53 -04:00
Brad King
593c3fa1d4 Utilities/Release: Remove unused linux/x86_64/test/cache-ninja.txt 2020-05-05 14:37:04 -04:00
Brad King
68a59ab288 Merge topic 'stl-support'
8d4a9ee398 Refactoring: rename "cm_static_string_view.hxx" as <cmext/string_view>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4689
2020-05-01 08:27:37 -04:00
Brad King
c09efe074d Merge topic 'gitlab-ci-lint'
4318e8ed35 gitlab-ci: add iwyu job
0866b9253b gitlab-ci: add initial clang-tidy build
0a5bcf97b9 gitlab-ci: add scripts for use by CI
960158b90d ci: add scripts to download build tools
6af91c7c4d ci: add an image for Debian 10
68903ae238 ci: add a Docker container for building CMake
3ac24a8a6e cmFunctionBlocker: include missing header
b745b8fd36 IWYU: mark includes needed for assert statements as needed
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4643
2020-04-30 10:00:02 -04:00
Marc Chevrier
8d4a9ee398 Refactoring: rename "cm_static_string_view.hxx" as <cmext/string_view> 2020-04-30 09:53:27 +02:00
Ben Boeckel
1bf8938825 IWYU: add a mapping for other __decay_and_strip instances 2020-04-29 11:16:44 -04:00
Ben Boeckel
3f01acbb44 IWYU: add some mappings found with a newer IWYU build 2020-04-29 11:16:44 -04:00
Brad King
2628eb7460 libuv: Add proctitle and threadpool cleanup stubs to cmake-bootstrap.c
These are now called by `uv_library_shutdown` in `src/uv-common.c` but
on UNIX we do not compile those features during CMake bootstrap.
2020-04-29 08:50:11 -04:00
Brad King
efdd451f4b Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
  libuv 2020-04-29 (e7ebae26)
2020-04-29 08:21:02 -04:00
Brad King
e608a6ef20 Merge topic 'update-kwiml'
7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml
bd202202ce KWIML 2020-04-20 (4abfeaa7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4639
2020-04-21 08:14:26 -04:00
Brad King
3465ae916f Merge topic 'FindBoost-1.73'
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
2020-04-21 07:44:31 -04:00
Brad King
7bfe2924f4 Merge branch 'upstream-KWIML' into update-kwiml
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2020-04-20 (4abfeaa7)
2020-04-20 08:42:21 -04:00
Alexander Grund
9daf79c53b FindBoost: Add support for Boost 1.73
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.73.0
sources to compute dependencies.

This includes a new Boost.Nowide library.

Special case: Boost.Filesystem is an optional dependency as the include
is only required to make Boost.Filesystem use UTF-8 paths on user
request
2020-04-20 08:27:32 -04:00
Alexander Grund
56b3375f3e BoostScanDeps: Fix typo in numpy handling
Fix a typo from commit e66e8e8914 (BoostScanDeps: Special case python
and numpy and variants, 2017-08-22, v3.10.0-rc1~229^2~1).
2020-04-20 08:27:31 -04:00
Marc Chevrier
40d1735681 Merge topic 'add-contains-to-cmext-algorithm'
aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4606
2020-04-18 05:27:52 -04:00
Marc Chevrier
aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm> 2020-04-17 10:00:03 +02:00
Jiri Malak
22aff63653 setup-user: restore portability
Changes in commit 5129e97285 (setup-user: switch to git-var to check if
username and e-mail are set, 2019-11-24, v3.17.0-rc1~379^2) now require
the `rev` and `cut` tools to be available.  Revise the logic to use that
approach only when they are available, and otherwise fall back to the
previous more portable approach.

Co-Author: Brad King <brad.king@kitware.com>
2020-04-15 10:30:04 -04:00
Brad King
630e501f8b libuv: Restore compilation on Apple i386 architecture
libuv upstream commit `2475296c` (build: make code compilable for iOS on
Xcode, 2020-01-18, v1.35.0~47) added a `defined(TARGET_OS_IPHONE)`
preprocessor condition, but `TARGET_OS_IPHONE` is always defined on
Apple to either 0 or 1.
2020-04-07 07:49:50 -04:00
Brad King
02a28f1d44 libuv: Restore compilation with XLClang 16.1 on AIX
libuv upstream commit `4a972bf0` (aix: Fix broken cmpxchgi() XL C++
specialization., 2019-09-06, v1.32.0~5) broke compilation with this
compiler.  According to

    https://www.ibm.com/support/knowledgecenter/SSGH3R_16.1.0/com.ibm.xlcpp161.aix.doc/migrate/migrate_to_xlclang.html

XLClang 16.1 for AIX does not support `__sync_val_compare_and_swap`.
The documentation suggests using C++11 atomic operations instead, but
this is C code.  For now fall back to the non-atomic equivalent used
before so we can at least compile.  Add a FIXME comment for this.
2020-04-07 07:47:47 -04:00
Brad King
722d6b4105 Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
  libuv 2020-04-06 (d21f5aea)
2020-04-06 11:58:14 -04:00
Brad King
5ded334ee1 Merge topic 'curl-http2'
02dd24a928 curl: Enable HTTP/2 support by using nghttp2
a24dd93e93 curl: When building inside CMake, link dependencies as PRIVATE
0b872fd4be nghttp2: Build the library within CMake for use by our curl
cd5a320d68 Merge branch 'upstream-nghttp2' into curl-http2
5dc6921805 nghttp2 2019-11-15 (cc05c5fe)
1b8e2c2a3d nghttp2: Add script to import from upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4560
2020-04-06 08:20:01 -04:00
Brad King
f0e97788e5 Merge topic 'rel-linux-openssl'
3a66c7674c Utilities/Release: Update to openssl 1.1.1f

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4563
2020-04-03 06:55:35 -04:00
Brad King
3a66c7674c Utilities/Release: Update to openssl 1.1.1f 2020-04-03 06:50:56 -04:00
Brad King
02dd24a928 curl: Enable HTTP/2 support by using nghttp2 2020-04-03 06:43:00 -04:00
Brad King
a24dd93e93 curl: When building inside CMake, link dependencies as PRIVATE 2020-04-03 06:43:00 -04:00
Brad King
0b872fd4be nghttp2: Build the library within CMake for use by our curl
Provide our own minimal `config.h` since the upstream one is much
larger to support other parts of its distribution.  Compile with
warnings disabled since this is third-party code.
2020-04-03 06:43:00 -04:00
Brad King
cd5a320d68 Merge branch 'upstream-nghttp2' into curl-http2
# By nghttp2 upstream
* upstream-nghttp2:
  nghttp2 2019-11-15 (cc05c5fe)
2020-04-01 13:30:31 -04:00
Brad King
1b8e2c2a3d nghttp2: Add script to import from upstream 2020-04-01 13:30:22 -04:00
Marc Chevrier
f034b0f663 CMake compilation: do not use compiler extensions
For now, compiler extensions are no longer activated on CMake sources.
However these extensions are still used for various third parties.

This MR is a partial answer to the issue #20454.
2020-03-23 10:29:58 +01:00
Brad King
6857aaaa06 Merge topic 'ibmi-fix-libuv-build' into release-3.17
7d6bd14dca libuv: Add support for building on IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4431
2020-03-09 08:58:38 -04:00
Brad King
809570c4a9 Merge topic 'ibmi-fix-libuv-build'
7d6bd14dca libuv: Add support for building on IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4431
2020-03-09 08:58:38 -04:00
Jesse Gorzinski
7d6bd14dca libuv: Add support for building on IBM i (OS400) 2020-03-06 14:24:01 -05:00
Brad King
85ad7190f3 curl: Set build options the way we need for CMake 2020-03-04 14:35:09 -05:00
Brad King
d61c3bd505 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-03-04 (b8d13668)
2020-03-04 14:34:39 -05:00
Brad King
84dc14a967 curl: Update script to get curl 7.69.0 2020-03-04 14:34:13 -05:00
Brad King
4cfadf3bc6 librhash: Fix -Wdocumentation warning about @param name 2020-03-03 07:55:03 -05:00
Brad King
8d3770738c librhash: Update build within CMake for rhash 1.3.9 2020-03-02 17:22:06 -05:00
Brad King
471ebc590e Merge branch 'upstream-librhash' into update-librhash
* upstream-librhash:
  librhash 2019-12-14 (75716b45)
2020-03-02 16:58:34 -05:00
Brad King
74f1a64572 librhash: Update import script to get rhash 1.3.9 2020-03-02 16:31:01 -05:00
Brad King
db1447b2cf bzip2: Disable MSVC warnings in 3rd party code
In commit 35acaa90c5 (bzip2: Add compilation flags to disable warnings
in third-party code, 2020-02-24) we forgot to disable warnings for MSVC.
2020-02-25 10:32:21 -05:00
Brad King
592ce3e89b Merge branch 'upstream-bzip2' into update-bzip2
# By bzip2 upstream
* upstream-bzip2:
  bzip2 2019-07-13 (6a8690fc)
2020-02-24 12:11:59 -05:00
Brad King
39f2a9b286 bzip2: Update import script to get bzip2 1.0.8 2020-02-24 12:11:30 -05:00
Brad King
35acaa90c5 bzip2: Add compilation flags to disable warnings in third-party code 2020-02-24 12:10:07 -05:00
Brad King
3d47b0ae97 Merge branch 'upstream-bzip2' into update-bzip2
# By bzip2 upstream
* upstream-bzip2:
  bzip2 2007-12-10 (a1d78c55)
2020-02-24 12:06:04 -05:00
Brad King
2c40844891 bzip2: Remove all sources to make room for fresh import 2020-02-24 12:05:51 -05:00
Brad King
09ab19a696 bzip2: add script to import bzip2 from upstream 2020-02-24 11:58:07 -05:00
Brad King
b83d96f164 libarchive: Update to build within CMake
Hard-code more libarchive options as internal cache entries.  Doing so
makes some of our `IF(0)` conditions unnecessary, so remove those.
2020-02-13 12:59:29 -05:00
Brad King
5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2020-02-11 (3288ebb0)

Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks.  Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
2020-02-13 12:57:52 -05:00
Brad King
9a27ecd416 libarchive: Update script to get 3.4.2 2020-02-13 12:57:20 -05:00
Brad King
7253b49ca9 Utilities/Release: Use python 3 for tests on Windows binaries
Explicitly specify the build machine's Python 3 installation for
Windows to be used by the test suite.  This avoids accidentally
using other versions on the machine.
2020-02-10 10:19:20 -05:00