Skip to content

Commit

Permalink
add submodule spdlog and do refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
thawk105 committed Feb 28, 2021
1 parent 8eee641 commit 97dc84e
Show file tree
Hide file tree
Showing 18 changed files with 269 additions and 270 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cicada_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
paths:
- 'cicada/**'
- 'common/**'
pull_request:
paths:
- 'cicada/**'
- 'common/**'

jobs:
Build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ermia_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
paths:
- 'ermia/**'
- 'common/**'
pull_request:
paths:
- 'ermia/**'
- 'common/**'

jobs:
Build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/mocc_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ on:
push:
paths:
- 'mocc/**'
- 'common/**'
pull_request:
- 'mocc/**'
- 'common/**'

jobs:
Build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/si_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
paths:
- 'si/**'
- 'common/**'
pull_request:
paths:
- 'si/**'
- 'common/**'

jobs:
Build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/silo_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
paths:
- 'silo/**'
- 'common/**'
pull_request:
paths:
- 'silo/**'
- 'common/**'

jobs:
Build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ss2pl_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
paths:
- 'ss2pl/**'
- 'common/**'
pull_request:
paths:
- 'ss2pl/**'
- 'common/**'

jobs:
Build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tictoc_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
paths:
- 'tictoc/**'
- 'common/**'
pull_request:
paths:
- 'tictoc/**'
- 'common/**'

jobs:
Build:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tpcc_silo_build_and_ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ name: tpcc_silo_build_and_ctest
on:
push:
paths:
- 'common/**'
- 'index/masstree_beta/masstree_beta_wrapper.cpp'
- 'tpcc_silo/**'
pull_request:
paths:
- 'common/**'
- 'index/masstree_beta/masstree_beta_wrapper.cpp'
- 'tpcc_silo/**'

jobs:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "third_party/mimalloc"]
path = third_party/mimalloc
url = https://github.com/microsoft/mimalloc.git
[submodule "third_party/spdlog"]
path = third_party/spdlog
url = https://github.com/gabime/spdlog.git
5 changes: 5 additions & 0 deletions cicada/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ target_link_libraries(cicada.exe
Threads::Threads
)

target_include_directories(cicada.exe
PRIVATE ${PROJECT_SOURCE_DIR}/../include
PRIVATE ${PROJECT_SOURCE_DIR}/../third_party/spdlog/include
)

if (DEFINED ADD_ANALYSIS)
add_definitions(-DADD_ANALYSIS=${ADD_ANALYSIS})
else ()
Expand Down
Loading

0 comments on commit 97dc84e

Please sign in to comment.