diff --git a/AudioFilter/CMakeLists.txt b/AudioFilter/CMakeLists.txt index 516741343a1751d8a3e7892637208ec0ac41a3e2..c3168e8a6b88a7c46037f5425a6646c4cab87596 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 716771bc177e8b49c4cc7b202f96194ffddabc44..1206532ee92d5239b2e24164bdb8c579729789ee 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 de54ba4644a85ff0620e0af388bc9956ad38d710..a0db3f1712959b108665c0d8aa978273334c5236 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 d4b4f16a91ac1ac184834694ae14df6a4c93eb83..3161df36e7612547f2a15d56d7fec6ef601e2932 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 264ec74182e8cc2204bb12df02bc3e74fba31086..78a45ce7f2f2b633396002c0378986ba1dc02469 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 40949a7939b25be9cb8b129d80e615346c40b8c8..c4773e65fde10d9b9a86afbb2081bc95d749ba88 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 0721bebfb8e8c0a7eb73d7c5f3a4b15c13ab6501..91f2630e3355c50505f23e65c1d23c72708f118e 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 68c3bfef8d8cb788083e3749b2d28fc79df0f042..415ccf7ba22462246d579d7cfe289a9d98e80e24 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 8ee8aff305e67db7a9f4e2a1c763419d78e853af..069b122fdfd4594f4b091edf0ec0e2332206c15d 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 0bb6d391edf6bb5df1550705bbf50a2cbb0de2d8..e00331fd64f9f4101aee93b7e731ceb2ecc3a21b 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 11bd26be772544d787b8cf7f37fb673bf1130fa9..4477d9dcc6d939b4fce1191739892f18f960e5ee 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 bd307508b41dcedc7b62946c41d9cb1588f3345d..6081a43d843b56f15a0059166e20fcacdae9a529 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 92e2466bf4d7eef9da89ba8d645d9caafcf8c11c..aeb88b45669cd591378b8725770b7ffc7ceecca3 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