From ba981bbe9ddcc0a988df8e09a1c747a979b66956 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Tue, 2 Aug 2022 14:28:04 -0300
Subject: [PATCH] misc: fix missing fmt files
Change-Id: I4a397988d8924a8f92eb0b5a68258ad16723b022
---
AudioFilter/CMakeLists.txt | 2 ++
AudioFilter/package.json | 1 +
AutoAnswer/CMakeLists.txt | 2 ++
AutoAnswer/package.json | 4 +++-
GreenScreen/CMakeLists.txt | 3 +++
GreenScreen/package.json | 1 +
HelloWorld/CMakeLists.txt | 2 ++
HelloWorld/package.json | 1 +
SDK/Templates/CMakeLists.txt | 2 ++
SDK/Templates/package.json | 4 +++-
WaterMark/CMakeLists.txt | 2 ++
WaterMark/package.json | 4 +++-
contrib/build-dependencies.sh | 2 +-
13 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/AudioFilter/CMakeLists.txt b/AudioFilter/CMakeLists.txt
index 5167413..c3168e8 100644
--- a/AudioFilter/CMakeLists.txt
+++ b/AudioFilter/CMakeLists.txt
@@ -62,11 +62,13 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB}
${DAEMON_SRC}
${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include
)
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/lib
${CONTRIB_PATH}/msvc/lib/x64
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
)
target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libswresample libavformat libavcodec libavutil libvpx libx264 libopus libmfx
diff --git a/AudioFilter/package.json b/AudioFilter/package.json
index 716771b..1206532 100644
--- a/AudioFilter/package.json
+++ b/AudioFilter/package.json
@@ -3,6 +3,7 @@
"version": "0.1.0",
"extractLibs": false,
"deps": [
+ "fmt",
"ffmpeg"
],
"defines": [],
diff --git a/AutoAnswer/CMakeLists.txt b/AutoAnswer/CMakeLists.txt
index de54ba4..a0db3f1 100644
--- a/AutoAnswer/CMakeLists.txt
+++ b/AutoAnswer/CMakeLists.txt
@@ -57,8 +57,10 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB}
${DAEMON_SRC}
${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/include
)
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
)
add_custom_command(
diff --git a/AutoAnswer/package.json b/AutoAnswer/package.json
index d4b4f16..3161df3 100644
--- a/AutoAnswer/package.json
+++ b/AutoAnswer/package.json
@@ -2,7 +2,9 @@
"name": "AutoAnswer",
"version": "2.0.0",
"extractLibs": false,
- "deps": [],
+ "deps": [
+ "fmt"
+ ],
"defines": [],
"custom_scripts": {
"pre_build": [
diff --git a/GreenScreen/CMakeLists.txt b/GreenScreen/CMakeLists.txt
index 264ec74..78a45ce 100644
--- a/GreenScreen/CMakeLists.txt
+++ b/GreenScreen/CMakeLists.txt
@@ -79,17 +79,20 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB}
${DAEMON_SRC}
${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include
${CONTRIB_PATH}/build/opencv/build/install/include
${ONNX_DIR}/../include/session
${ONNX_DIR}/../include/providers/cuda
)
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
${CONTRIB_PATH}/build/opencv/build/lib/Release
${CONTRIB_PATH}/build/opencv/build/3rdparty/lib/Release
${FFMPEG}/lib
${ONNX_DIR}
${CONTRIB_PATH}/msvc/lib/x64
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
)
target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libavformat libavcodec libavutil libvpx libx264 libopus libmfx
diff --git a/GreenScreen/package.json b/GreenScreen/package.json
index 40949a7..c4773e6 100644
--- a/GreenScreen/package.json
+++ b/GreenScreen/package.json
@@ -3,6 +3,7 @@
"version": "2.0.0",
"extractLibs": false,
"deps": [
+ "fmt",
"ffmpeg",
"opencv"
],
diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt
index 0721beb..91f2630 100644
--- a/HelloWorld/CMakeLists.txt
+++ b/HelloWorld/CMakeLists.txt
@@ -65,6 +65,7 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB}
${DAEMON_SRC}
${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include
${CONTRIB_PATH}/build/opencv/build/install/include
)
@@ -72,6 +73,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/bin
${CONTRIB_PATH}/build/opencv/build/lib/Release
${CONTRIB_PATH}/build/opencv/build/3rdparty/lib/Release
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
)
target_link_libraries(${ProjectName} PUBLIC swscale avutil opencv_imgproc460 opencv_core460 zlib)
diff --git a/HelloWorld/package.json b/HelloWorld/package.json
index 68c3bfe..415ccf7 100644
--- a/HelloWorld/package.json
+++ b/HelloWorld/package.json
@@ -3,6 +3,7 @@
"version": "1.0.1",
"extractLibs": false,
"deps": [
+ "fmt",
"ffmpeg",
"opencv"
],
diff --git a/SDK/Templates/CMakeLists.txt b/SDK/Templates/CMakeLists.txt
index 8ee8aff..069b122 100644
--- a/SDK/Templates/CMakeLists.txt
+++ b/SDK/Templates/CMakeLists.txt
@@ -55,9 +55,11 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB}
${DAEMON_SRC}
${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/include
---${FFMPEG}/include---
)
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
---${FFMPEG}/bin---
)
diff --git a/SDK/Templates/package.json b/SDK/Templates/package.json
index 0bb6d39..e00331f 100644
--- a/SDK/Templates/package.json
+++ b/SDK/Templates/package.json
@@ -2,7 +2,9 @@
"name": "",
"version": "",
"extractLibs": false,
- "deps": [],
+ "deps": [
+ "fmt"
+ ],
"defines": [],
"custom_scripts": {
"pre_build": [
diff --git a/WaterMark/CMakeLists.txt b/WaterMark/CMakeLists.txt
index 11bd26b..4477d9d 100644
--- a/WaterMark/CMakeLists.txt
+++ b/WaterMark/CMakeLists.txt
@@ -66,11 +66,13 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB}
${DAEMON_SRC}
${CONTRIB_PATH}
+ ${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include
)
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/lib
${CONTRIB_PATH}/msvc/lib/x64
+ ${CONTRIB_PATH}/build/fmt/msvc/Release
)
target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libavformat libavcodec libavutil libvpx libx264 libopus libmfx
diff --git a/WaterMark/package.json b/WaterMark/package.json
index bd30750..6081a43 100644
--- a/WaterMark/package.json
+++ b/WaterMark/package.json
@@ -2,7 +2,9 @@
"name": "WaterMark",
"version": "2.0.0",
"extractLibs": false,
- "deps": [],
+ "deps": [
+ "fmt"
+ ],
"defines": [],
"custom_scripts": {
"pre_build": [
diff --git a/contrib/build-dependencies.sh b/contrib/build-dependencies.sh
index 92e2466..aeb88b4 100755
--- a/contrib/build-dependencies.sh
+++ b/contrib/build-dependencies.sh
@@ -143,7 +143,7 @@ echo "copying files"
cp -r ${CURRENTDIR}/freetype ${DAEMON_DIR}/contrib/src
cd ${CONTRIB_DIR}
-../bootstrap --host=${TARGET_TUPLE} --enable-freetype --enable-ffmpeg --disable-webrtc-audio-processing --disable-argon2 --disable-asio --disable-fmt --disable-gcrypt --disable-gmp --disable-gnutls --disable-gpg-error --disable-gsm --disable-http_parser --disable-jack --disable-jsoncpp --disable-libarchive --disable-libressl --disable-msgpack --disable-natpmp --disable-nettle --enable-opencv --disable-opendht --disable-pjproject --disable-portaudio --disable-restinio --disable-secp256k1 --disable-speexdsp --disable-upnp --disable-uuid --disable-yaml-cpp
+../bootstrap --host=${TARGET_TUPLE} --enable-freetype --enable-ffmpeg --disable-webrtc-audio-processing --disable-argon2 --disable-asio --enable-fmt --disable-gcrypt --disable-gmp --disable-gnutls --disable-gpg-error --disable-gsm --disable-http_parser --disable-jack --disable-jsoncpp --disable-libarchive --disable-libressl --disable-msgpack --disable-natpmp --disable-nettle --enable-opencv --disable-opendht --disable-pjproject --disable-portaudio --disable-restinio --disable-secp256k1 --disable-speexdsp --disable-upnp --disable-uuid --disable-yaml-cpp
make list
make fetch
--
GitLab