diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-10-02 22:46:55 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-10-02 21:49:36 +0000 |
| commit | 1a48b226868f493da44ff6ecf7d29dd5d9f369e9 (patch) | |
| tree | b201a6bdced7858f05727145a2b723222f96cc86 /.travis.yml | |
| parent | 79fc1f164d3cf4c7ad200c1dc79d002142b4e847 (diff) | |
travis: fix compatibility with CMake 3.15
Since CMake 3.15.0, CMAKE_BUILD_PARALLEL_LEVEL=0 is rejected. Set an
empty value to achieve the desired behavior (enabling parallelism).
Change-Id: I6d32bc7286d32c2f2a3605b42ef82e28342da440
Reviewed-on: https://code.wireshark.org/review/34686
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3574cf0ff6..257cae445e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,7 +114,7 @@ before_script: - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake -A $PLATFORM ..; fi script: # Enable parallelism for msbuild too (since CMake 3.12; ninja does not need it) - - export CMAKE_BUILD_PARALLEL_LEVEL=0 + - export CMAKE_BUILD_PARALLEL_LEVEL= - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake() { ../tools/filter-msbuild.py cmake "$@"; }; fi # Invoke ninja (Linux/macOS, --config is ignored) or msbuild (Windows) - cmake --build . --config RelWithDebInfo |