Merge branch 'release/2022.2.1' into main

shiguredo · Jun 6, 2022 · 6edbbed · 6edbbed
2 parents a523fcb + 28febd9
commit 6edbbed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,11 @@
 
 ## develop
 
+## 2022.2.1
+
+- [FIX] Windows で libmfx.lib ライブラリを要求してしまっていたのを修正
+    - @melpon
+
 ## 2022.2.0
 
 - [ADD] Intel Media SDK を使ったハードウェアエンコーダ/デコーダを実装

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -294,7 +294,7 @@ if (SORA_TARGET_OS STREQUAL "windows")
         src/hwenc_msdk/msdk_video_encoder.cpp
     )
     target_include_directories(sora PRIVATE ${MSDK_ROOT_DIR}/include)
-    target_link_libraries(sora PRIVATE ${MSDK_ROOT_DIR}/lib/libmfx.lib)
+    target_link_libraries(sora PRIVATE "$<BUILD_INTERFACE:${MSDK_ROOT_DIR}/lib/libmfx.lib>")
     # mfx を要求したくないので sora.lib に含める
     list(APPEND BUNDLE_STATIC_LIBS ${MSDK_ROOT_DIR}/lib/libmfx.lib)
   endif()

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-SORA_CPP_SDK_VERSION=2022.2.0
+SORA_CPP_SDK_VERSION=2022.2.1
 WEBRTC_BUILD_VERSION=m102.5005.7.5
 BOOST_VERSION=1.79.0
 CMAKE_VERSION=3.23.1