Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade deps #68

Merged
merged 2 commits into from
Dec 8, 2018
Merged

Upgrade deps #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3469bc6
upgrades
Dec 8, 2018
0573e60
ask clang-tidy to ignore fuchsia-default-arguments
Dec 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
---
Checks: '*,-cert-err58-cpp'
# clang-analyzer-core.uninitialized.UndefReturn can be removed once LLVM is upgrade to fix
# https://bugs.llvm.org/show_bug.cgi?id=39201
Checks: '*,-fuchsia-default-arguments,-clang-analyzer-core.uninitialized.UndefReturn'
WarningsAsErrors: '*'
HeaderFilterRegex: '\/include\/'
AnalyzeTemporaryDtors: false
CheckOptions:
CheckOptions:
- key: google-readability-braces-around-statements.ShortStatementLines
value: '1'
- key: google-readability-function-size.StatementThreshold
Expand All @@ -25,4 +27,3 @@ CheckOptions:
- key: modernize-use-nullptr.NullMacros
value: 'NULL'
...

4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ if (WERROR)
endif()

# mason_use is a mason function within the mason.cmake file and provides ready-to-go vars, like "STATIC_LIBS" and "INCLUDE_DIRS"
mason_use(catch VERSION 1.9.6 HEADER_ONLY)
mason_use(catch VERSION 2.4.0 HEADER_ONLY)
include_directories(SYSTEM ${MASON_PACKAGE_catch_INCLUDE_DIRS})

mason_use(benchmark VERSION 1.2.0)
mason_use(benchmark VERSION 1.4.1)
include_directories(SYSTEM ${MASON_PACKAGE_benchmark_INCLUDE_DIRS})

include_directories("${PROJECT_SOURCE_DIR}/include")
Expand Down
7 changes: 2 additions & 5 deletions scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
set -eu
set -o pipefail

export MASON_RELEASE="${_MASON_RELEASE:-v0.18.0}"
export MASON_LLVM_RELEASE="${_MASON_LLVM_RELEASE:-5.0.1}"
export MASON_RELEASE="${_MASON_RELEASE:-v0.19.0}"
export MASON_LLVM_RELEASE="${_MASON_LLVM_RELEASE:-7.0.0}"

PLATFORM=$(uname | tr A-Z a-z)
if [[ ${PLATFORM} == 'darwin' ]]; then
Expand Down Expand Up @@ -41,9 +41,6 @@ function run() {
elif [[ -d ${GLOBAL_CLANG} ]]; then
echo "Detected '${GLOBAL_CLANG}/bin/clang++', using it"
local llvm_toolchain_dir=${GLOBAL_CLANG}
elif [[ -d ${GLOBAL_CLANG} ]]; then
echo "Detected '${GLOBAL_CLANG}/bin/clang++', using it"
local llvm_toolchain_dir=${GLOBAL_CLANG}
elif [[ ! -d ${llvm_toolchain_dir} ]]; then
BINARY="${MASON_URL}/clang++/${MASON_LLVM_RELEASE}.tar.gz"
echo "Downloading ${BINARY}"
Expand Down