Skip to content

Commit

Permalink
github action gcc-11 has google benchmark compile error
Browse files Browse the repository at this point in the history
  • Loading branch information
injae committed Jul 11, 2021
1 parent 0bc2f4d commit 722a981
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
ubuntu-bionic-gcc-11:
runs-on: ubuntu-18.04
env:
CMAKE_FLAGS: '-DUSE_CPPM_PATH=ON -DSERDEPP_USE_NLOHMANN_JSON=ON -DSERDEPP_USE_TOML11=ON -DSERDEPP_USE_YAML-CPP=ON -DSERDEPP_BUILD_EXAMPLES=ON -DSERDEPP_USE_BENCHMARK=ON'
CMAKE_FLAGS: '-DUSE_CPPM_PATH=ON -DSERDEPP_USE_NLOHMANN_JSON=ON -DSERDEPP_USE_TOML11=ON -DSERDEPP_USE_YAML-CPP=ON -DSERDEPP_BUILD_EXAMPLES=ON'
strategy:
matrix:
build-type: ['Release', 'Debug']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
macos-clang:
runs-on: macos-latest
env:
CMAKE_FLAGS: '-DUSE_CPPM_PATH=ON -DSERDEPP_USE_NLOHMANN_JSON=ON -DSERDEPP_USE_TOML11=ON -DSERDEPP_USE_YAML-CPP=ON -DSERDEPP_BUILD_EXAMPLES=ON -DSERDEPP_USE_BENCHMARK=ON'
CMAKE_FLAGS: '-DUSE_CPPM_PATH=ON -DSERDEPP_USE_NLOHMANN_JSON=ON -DSERDEPP_USE_TOML11=ON -DSERDEPP_USE_YAML-CPP=ON -DSERDEPP_BUILD_EXAMPLES=ON'
strategy:
matrix:
build-type: ['Release', 'Debug']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/window.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
windows-msvc:
runs-on: windows-2019
env:
CMAKE_FLAGS: '-DUSE_CPPM_PATH=ON -DSERDEPP_USE_NLOHMANN_JSON=ON -DSERDEPP_USE_TOML11=ON -DSERDEPP_USE_YAML-CPP=ON -DSERDEPP_BUILD_EXAMPLES=ON -DSERDEPP_USE_BENCHMARK=ON'
CMAKE_FLAGS: '-DUSE_CPPM_PATH=ON -DSERDEPP_USE_NLOHMANN_JSON=ON -DSERDEPP_USE_TOML11=ON -DSERDEPP_USE_YAML-CPP=ON -DSERDEPP_BUILD_EXAMPLES=ON'
strategy:
matrix:
build-type: ['Release', 'Debug']
Expand Down
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ SOURCES
examples/simple_example.cpp
)

cppm_target_define(benchmark BINARY
SOURCES
benchmark/benchmark.cpp
)

endif()


Expand All @@ -66,14 +61,9 @@ cppm_target_dependencies(simple_example
${serdepp_global_deps}
serdepp)

cppm_target_dependencies(benchmark
${serdepp_global_deps}
serdepp)


cppm_target_install(serdepp)
cppm_target_install(serde_example1)
cppm_target_install(serde_example)
cppm_target_install(simple_example)
cppm_target_install(benchmark)

2 changes: 1 addition & 1 deletion cppm.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
name = "simple_example"
source = ["examples/simple_example.cpp"]

[[example]]
[[benchmark]]
name = "benchmark"
source = ["benchmark/benchmark.cpp"]

Expand Down

0 comments on commit 722a981

Please sign in to comment.