Skip to content

Commit

Permalink
Merge branch 'release/2023.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
haruyama committed Sep 6, 2023
2 parents 924932a + 57cc970 commit ba39c83
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
11 changes: 11 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@

## develop

## 2023.2.0

- [UPDATE] 依存ライブラリの更新
- `boost``1.83.0`
- `rapidcsv``8.77`
- @haruyama
- [ADD] H.264 Track のサポート
- @haruyama
- [UPDATE] AV1 Track の調整
- @haruyama

## 2023.1.1

- [FIX] Version 上げ忘れを修正 #25
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ set(CMAKE_CXX_COMPILER clang++)
include(cmake/env.cmake)
include(cmake/tools.cmake)

set_cache_string_from_env(BOOST_VERSION 1.81.0 "Boost のバージョン")
set_cache_string_from_env(BOOST_VERSION 1.83.0 "Boost のバージョン")
set_cache_string_from_env(CLI11_VERSION 2.3.2 "CLI11 のバージョン")
set_cache_string_from_env(FMT_VERSION 9.1.0 "fmt のバージョン")
set_cache_string_from_env(RAPIDCSV_VERSION 8.69 "rapidcsv のバージョン")
set_cache_string_from_env(RAPIDCSV_VERSION 8.77 "rapidcsv のバージョン")
set_cache_string_from_env(SPDLOG_VERSION 1.11.0 "spdlog のバージョン")

add_compile_options(
Expand Down
1 change: 1 addition & 0 deletions src/reader/reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <iostream>
#include <istream>
#include <iterator>
#include <sstream>
#include <stdexcept>
#include <string>

Expand Down

0 comments on commit ba39c83

Please sign in to comment.