Skip to content
Snippets Groups Projects
Commit ba981bbe authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

misc: fix missing fmt files

Change-Id: I4a397988d8924a8f92eb0b5a68258ad16723b022
parent 6f14a5d4
No related branches found
No related tags found
No related merge requests found
...@@ -62,11 +62,13 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR} ...@@ -62,11 +62,13 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB} ${PLUGINS_LIB}
${DAEMON_SRC} ${DAEMON_SRC}
${CONTRIB_PATH} ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include ${FFMPEG}/include
) )
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/lib ${FFMPEG}/lib
${CONTRIB_PATH}/msvc/lib/x64 ${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 target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libswresample libavformat libavcodec libavutil libvpx libx264 libopus libmfx
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"extractLibs": false, "extractLibs": false,
"deps": [ "deps": [
"fmt",
"ffmpeg" "ffmpeg"
], ],
"defines": [], "defines": [],
......
...@@ -57,8 +57,10 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR} ...@@ -57,8 +57,10 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB} ${PLUGINS_LIB}
${DAEMON_SRC} ${DAEMON_SRC}
${CONTRIB_PATH} ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/include
) )
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/msvc/Release
) )
add_custom_command( add_custom_command(
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
"name": "AutoAnswer", "name": "AutoAnswer",
"version": "2.0.0", "version": "2.0.0",
"extractLibs": false, "extractLibs": false,
"deps": [], "deps": [
"fmt"
],
"defines": [], "defines": [],
"custom_scripts": { "custom_scripts": {
"pre_build": [ "pre_build": [
......
...@@ -79,17 +79,20 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR} ...@@ -79,17 +79,20 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB} ${PLUGINS_LIB}
${DAEMON_SRC} ${DAEMON_SRC}
${CONTRIB_PATH} ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include ${FFMPEG}/include
${CONTRIB_PATH}/build/opencv/build/install/include ${CONTRIB_PATH}/build/opencv/build/install/include
${ONNX_DIR}/../include/session ${ONNX_DIR}/../include/session
${ONNX_DIR}/../include/providers/cuda ${ONNX_DIR}/../include/providers/cuda
) )
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} 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/lib/Release
${CONTRIB_PATH}/build/opencv/build/3rdparty/lib/Release ${CONTRIB_PATH}/build/opencv/build/3rdparty/lib/Release
${FFMPEG}/lib ${FFMPEG}/lib
${ONNX_DIR} ${ONNX_DIR}
${CONTRIB_PATH}/msvc/lib/x64 ${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 target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libavformat libavcodec libavutil libvpx libx264 libopus libmfx
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"version": "2.0.0", "version": "2.0.0",
"extractLibs": false, "extractLibs": false,
"deps": [ "deps": [
"fmt",
"ffmpeg", "ffmpeg",
"opencv" "opencv"
], ],
......
...@@ -65,6 +65,7 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR} ...@@ -65,6 +65,7 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB} ${PLUGINS_LIB}
${DAEMON_SRC} ${DAEMON_SRC}
${CONTRIB_PATH} ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include ${FFMPEG}/include
${CONTRIB_PATH}/build/opencv/build/install/include ${CONTRIB_PATH}/build/opencv/build/install/include
) )
...@@ -72,6 +73,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} ...@@ -72,6 +73,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/bin ${FFMPEG}/bin
${CONTRIB_PATH}/build/opencv/build/lib/Release ${CONTRIB_PATH}/build/opencv/build/lib/Release
${CONTRIB_PATH}/build/opencv/build/3rdparty/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) target_link_libraries(${ProjectName} PUBLIC swscale avutil opencv_imgproc460 opencv_core460 zlib)
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"version": "1.0.1", "version": "1.0.1",
"extractLibs": false, "extractLibs": false,
"deps": [ "deps": [
"fmt",
"ffmpeg", "ffmpeg",
"opencv" "opencv"
], ],
......
...@@ -55,9 +55,11 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR} ...@@ -55,9 +55,11 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB} ${PLUGINS_LIB}
${DAEMON_SRC} ${DAEMON_SRC}
${CONTRIB_PATH} ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/include
---${FFMPEG}/include--- ---${FFMPEG}/include---
) )
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/msvc/Release
---${FFMPEG}/bin--- ---${FFMPEG}/bin---
) )
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
"name": "", "name": "",
"version": "", "version": "",
"extractLibs": false, "extractLibs": false,
"deps": [], "deps": [
"fmt"
],
"defines": [], "defines": [],
"custom_scripts": { "custom_scripts": {
"pre_build": [ "pre_build": [
......
...@@ -66,11 +66,13 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR} ...@@ -66,11 +66,13 @@ target_include_directories(${ProjectName} PUBLIC ${PROJECT_BINARY_DIR}
${PLUGINS_LIB} ${PLUGINS_LIB}
${DAEMON_SRC} ${DAEMON_SRC}
${CONTRIB_PATH} ${CONTRIB_PATH}
${CONTRIB_PATH}/build/fmt/include
${FFMPEG}/include ${FFMPEG}/include
) )
target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH} target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/lib ${FFMPEG}/lib
${CONTRIB_PATH}/msvc/lib/x64 ${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 target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libavformat libavcodec libavutil libvpx libx264 libopus libmfx
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
"name": "WaterMark", "name": "WaterMark",
"version": "2.0.0", "version": "2.0.0",
"extractLibs": false, "extractLibs": false,
"deps": [], "deps": [
"fmt"
],
"defines": [], "defines": [],
"custom_scripts": { "custom_scripts": {
"pre_build": [ "pre_build": [
......
...@@ -143,7 +143,7 @@ echo "copying files" ...@@ -143,7 +143,7 @@ echo "copying files"
cp -r ${CURRENTDIR}/freetype ${DAEMON_DIR}/contrib/src cp -r ${CURRENTDIR}/freetype ${DAEMON_DIR}/contrib/src
cd ${CONTRIB_DIR} 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 list
make fetch make fetch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment