fixed mdetection install

shuaizhengyi · Dec 2, 2021 · 70664b0 · 70664b0
1 parent 5add01b
commit 70664b0
Show file tree

Hide file tree

Showing 145 changed files with 9 additions and 25,880 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.9)
 
-project(MTTracking VERSION 1.0.0)
+project(MTTracking VERSION 1.0.1)
 
 unset(CMAKE_C_FLAGS CACHE)
 unset(CMAKE_CXX_FLAGS CACHE)

diff --git a/async_detector/CMakeLists.txt b/async_detector/CMakeLists.txt
@@ -48,4 +48,4 @@ endif(BUILD_YOLO_LIB)
 ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES} ${HEADERS})
 
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIBS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${LIBS})
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -65,4 +65,4 @@ endif(BUILD_CARS_COUNTING)
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES} ${HEADERS})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIBS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${LIBS})
diff --git a/src/Detector/BaseDetector.cpp b/src/Detector/BaseDetector.cpp
@@ -90,7 +90,7 @@ std::unique_ptr<BaseDetector> BaseDetector::CreateDetector(tracking::Detectors d
 
     if (!detector->Init(config))
         detector.reset();
-    return std::move(detector);
+    return detector;
 }
 
 ///
@@ -103,4 +103,4 @@ std::unique_ptr<BaseDetector> BaseDetector::CreateDetectorKV(tracking::Detectors
     }
     cv::UMat uframe = gray.getUMat(cv::ACCESS_READ);
     return CreateDetector(detectorType, mconfig, uframe);
-}
+}
diff --git a/src/Detector/CMakeLists.txt b/src/Detector/CMakeLists.txt
@@ -103,9 +103,9 @@ if (BUILD_YOLO_TENSORRT)
 endif(BUILD_YOLO_TENSORRT)
 
 
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
 
-set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${detector_headers}")
+set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${detector_headers};../common/defines.h;../common/object_types.h")
 install(TARGETS ${PROJECT_NAME}
         EXPORT MTTrackingExports
         LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib

diff --git a/src/Detector/MotionDetector.cpp b/src/Detector/MotionDetector.cpp
@@ -81,7 +81,7 @@ void MotionDetector::Detect(const cv::UMat& gray)
     if (!m_ignoreMask.empty())
         cv::bitwise_and(m_fg, m_ignoreMask, m_fg);
 
-	DetectContour();
+    DetectContour();
 }
 
 ///

diff --git a/src/Tracker/CMakeLists.txt b/src/Tracker/CMakeLists.txt
@@ -221,7 +221,7 @@ else(CMAKE_COMPILER_IS_GNUCXX)
     target_include_directories(${PROJECT_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS})
 endif()
 
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${tracker_headers};../common/defines.h;../common/object_types.h")
 install(TARGETS ${PROJECT_NAME}

diff --git a/thirdparty/pybind11/docs/Doxyfile b/thirdparty/pybind11/docs/Doxyfile
diff --git a/thirdparty/pybind11/docs/_static/theme_overrides.css b/thirdparty/pybind11/docs/_static/theme_overrides.css
diff --git a/thirdparty/pybind11/docs/advanced/cast/chrono.rst b/thirdparty/pybind11/docs/advanced/cast/chrono.rst
diff --git a/thirdparty/pybind11/docs/advanced/cast/custom.rst b/thirdparty/pybind11/docs/advanced/cast/custom.rst
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,4 +48,4 @@ endif(BUILD_YOLO_LIB)
		ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES} ${HEADERS})


		TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIBS})
		TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${LIBS})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,4 +65,4 @@ endif(BUILD_CARS_COUNTING)

		ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES} ${HEADERS})

		TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIBS})
		TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${LIBS})