diff --git a/libraries/dl-streamer/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt b/libraries/dl-streamer/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt index 71b182364..bace9e3cc 100644 --- a/libraries/dl-streamer/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt +++ b/libraries/dl-streamer/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt @@ -22,28 +22,28 @@ else() set(GVAMD_MAIN_SOURCE gvamotiondetect.cpp) endif() -add_library(gstgvamotiondetect MODULE ${GVAMD_MAIN_SOURCE} ${GVAMD_EXTRA_SOURCES}) +add_library(gvamotiondetect MODULE ${GVAMD_MAIN_SOURCE} ${GVAMD_EXTRA_SOURCES}) if(MSVC) # Use generator expressions so MSVC multi-config builds place DLL at: - # /intel64//bin//gstgvamotiondetect.dll + # /intel64//bin//gvamotiondetect.dll # Import lib (.lib) at: - # /intel64//lib//gstgvamotiondetect.lib - set_target_properties(gstgvamotiondetect PROPERTIES + # /intel64//lib//gvamotiondetect.lib + set_target_properties(gvamotiondetect PROPERTIES PREFIX "" - OUTPUT_NAME "gstgvamotiondetect" + OUTPUT_NAME "gvamotiondetect" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intel64/$/bin/$" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intel64/$/bin/$" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intel64/$/lib/$" ) else() - set_target_properties(gstgvamotiondetect PROPERTIES OUTPUT_NAME "gvamotiondetect" PREFIX "libgst") + set_target_properties(gvamotiondetect PROPERTIES OUTPUT_NAME "gvamotiondetect" PREFIX "libgst") endif() # Disable ITT notify API to avoid linking against external instrumentation library -target_compile_definitions(gstgvamotiondetect PRIVATE INTEL_NO_ITTNOTIFY_API) +target_compile_definitions(gvamotiondetect PRIVATE INTEL_NO_ITTNOTIFY_API) -target_include_directories(gstgvamotiondetect PRIVATE +target_include_directories(gvamotiondetect PRIVATE ${PROJECT_SOURCE_DIR}/include ${GST_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include/dlstreamer/gst/videoanalytics/ @@ -52,11 +52,11 @@ target_include_directories(gstgvamotiondetect PRIVATE ${CMAKE_SOURCE_DIR}/thirdparty/itt/include # restore ITT header path for ENABLE_ITT builds ) -target_link_libraries(gstgvamotiondetect PRIVATE PkgConfig::GST dlstreamer_gst dlstreamer_gst_meta gstvideoanalyticsmeta) +target_link_libraries(gvamotiondetect PRIVATE PkgConfig::GST dlstreamer_gst dlstreamer_gst_meta gstvideoanalyticsmeta) if(NOT MSVC) # VAAPI / GstVA only for non-Windows builds - target_link_libraries(gstgvamotiondetect PRIVATE + target_link_libraries(gvamotiondetect PRIVATE PkgConfig::GSTVA dlstreamer_vaapi ) @@ -65,28 +65,28 @@ endif() if(NOT MSVC) pkg_check_modules(LIBVA QUIET IMPORTED_TARGET libva) if (LIBVA_FOUND) - target_link_libraries(gstgvamotiondetect PRIVATE PkgConfig::LIBVA) + target_link_libraries(gvamotiondetect PRIVATE PkgConfig::LIBVA) else() find_library(LIBVA_LIB va) if (LIBVA_LIB) - target_link_libraries(gstgvamotiondetect PRIVATE ${LIBVA_LIB}) + target_link_libraries(gvamotiondetect PRIVATE ${LIBVA_LIB}) endif() endif() endif() find_package(OpenCL QUIET) if (OpenCL_FOUND) - target_link_libraries(gstgvamotiondetect PRIVATE OpenCL::OpenCL) - target_compile_definitions(gstgvamotiondetect PRIVATE HAVE_OPENCL_LOADER=1) + target_link_libraries(gvamotiondetect PRIVATE OpenCL::OpenCL) + target_compile_definitions(gvamotiondetect PRIVATE HAVE_OPENCL_LOADER=1) endif() find_package(OpenCV QUIET COMPONENTS core imgproc) if (OpenCV_FOUND) - target_include_directories(gstgvamotiondetect PRIVATE ${OpenCV_INCLUDE_DIRS}) - target_link_libraries(gstgvamotiondetect PRIVATE ${OpenCV_LIBS}) - target_compile_definitions(gstgvamotiondetect PRIVATE HAVE_OPENCV=1) + target_include_directories(gvamotiondetect PRIVATE ${OpenCV_INCLUDE_DIRS}) + target_link_libraries(gvamotiondetect PRIVATE ${OpenCV_LIBS}) + target_compile_definitions(gvamotiondetect PRIVATE HAVE_OPENCV=1) endif() -install(TARGETS gstgvamotiondetect +install(TARGETS gvamotiondetect LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gstreamer-1.0 ) diff --git a/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt b/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt index ffdf45e79..8f2e6a96c 100644 --- a/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt +++ b/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt @@ -32,6 +32,7 @@ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvametapublish/file/ ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvatrack/ ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark/ + ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvamotiondetect/ ) target_link_directories(${TARGET_NAME} PUBLIC ${VA_LIBRARY_DIRS}) diff --git a/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp b/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp index cabe7301e..3361acd64 100644 --- a/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp +++ b/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp @@ -32,6 +32,7 @@ #include "gvametapublish.hpp" #include "gvametapublishfile.hpp" +#include "gvamotiondetect.h" static gboolean plugin_init(GstPlugin *plugin) { set_log_function(GST_logger); @@ -63,6 +64,8 @@ static gboolean plugin_init(GstPlugin *plugin) { return FALSE; if (!gst_element_register(plugin, "gvametapublishfile", GST_RANK_NONE, GST_TYPE_GVA_META_PUBLISH_FILE)) return FALSE; + if (!gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT)) + return FALSE; #endif // register metadata