Raymond Gauthier
2 years ago
parent
0e3b49e9a6
commit
11af729cd0
@ -0,0 +1,25 @@ |
||||
From 90b540bd135de2587352719b14c385b20aa572be Mon Sep 17 00:00:00 2001
|
||||
From: Raymond Gauthier <jraygauthier@gmail.com>
|
||||
Date: Wed, 15 Jun 2022 16:09:58 -0400
|
||||
Subject: [PATCH] cmake-find-aravis: fix pkg cfg include dirs
|
||||
|
||||
---
|
||||
cmake/modules/FindAravis.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/modules/FindAravis.cmake b/cmake/modules/FindAravis.cmake
|
||||
index 5dab5431..811302b9 100644
|
||||
--- a/cmake/modules/FindAravis.cmake
|
||||
+++ b/cmake/modules/FindAravis.cmake
|
||||
@@ -20,7 +20,7 @@ find_path(aravis_INCLUDE_DIR
|
||||
arv.h
|
||||
PATHS
|
||||
${aravis_PKGCONF_INCLUDE_DIRS}
|
||||
- ${aravis0_6_PKGCONF_INCLUDE_DIRS}
|
||||
+ ${aravis0_8_PKGCONF_INCLUDE_DIRS}
|
||||
/usr/local/include
|
||||
# /usr/local/include/aravis-0.4
|
||||
/usr/local/include/aravis-0.8
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,70 @@ |
||||
From 5e7146e176cb1b01b47d16a66763469dccd87f25 Mon Sep 17 00:00:00 2001
|
||||
From: Raymond Gauthier <jraygauthier@gmail.com>
|
||||
Date: Thu, 9 Jun 2022 19:45:30 -0400
|
||||
Subject: [PATCH] tcamconvert&tcamsrc: add missing include/lib dirs
|
||||
|
||||
These were building libraries with dependencies on gstreamer-video
|
||||
and gstreamer-base but weren't adding the proper include and
|
||||
lib directories which resulted in build failure on systems
|
||||
where video and base aren't installed in the same location
|
||||
as gstreamer itself (e.g: nix, nixos).
|
||||
---
|
||||
src/gstreamer-1.0/tcamconvert/CMakeLists.txt | 2 ++
|
||||
src/gstreamer-1.0/tcamsrc/CMakeLists.txt | 11 +++++++++++
|
||||
2 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/src/gstreamer-1.0/tcamconvert/CMakeLists.txt b/src/gstreamer-1.0/tcamconvert/CMakeLists.txt
|
||||
index 30563c38..066cb5d7 100644
|
||||
--- a/src/gstreamer-1.0/tcamconvert/CMakeLists.txt
|
||||
+++ b/src/gstreamer-1.0/tcamconvert/CMakeLists.txt
|
||||
@@ -28,6 +28,8 @@ add_library(tcamconvert SHARED
|
||||
target_include_directories(tcamconvert
|
||||
PRIVATE
|
||||
${GSTREAMER_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_BASE_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_VIDEO_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set_project_warnings(tcamconvert)
|
||||
diff --git a/src/gstreamer-1.0/tcamsrc/CMakeLists.txt b/src/gstreamer-1.0/tcamsrc/CMakeLists.txt
|
||||
index 3bc7ed97..ed5be37f 100644
|
||||
--- a/src/gstreamer-1.0/tcamsrc/CMakeLists.txt
|
||||
+++ b/src/gstreamer-1.0/tcamsrc/CMakeLists.txt
|
||||
@@ -21,12 +21,15 @@ add_library(gsttcamstatistics SHARED
|
||||
target_include_directories(gsttcamstatistics
|
||||
PRIVATE
|
||||
${GSTREAMER_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_BASE_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_VIDEO_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
target_link_libraries( gsttcamstatistics
|
||||
PRIVATE
|
||||
${GSTREAMER_LIBRARIES}
|
||||
${GSTREAMER_BASE_LIBRARIES}
|
||||
+ ${GSTREAMER_VIDEO_LIBRARIES}
|
||||
)
|
||||
|
||||
|
||||
@@ -53,10 +56,18 @@ add_library(gsttcamsrc SHARED
|
||||
tcambind.cpp
|
||||
)
|
||||
|
||||
+ target_include_directories(gsttcamsrc
|
||||
+ PRIVATE
|
||||
+ ${GSTREAMER_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_BASE_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_VIDEO_INCLUDE_DIRS}
|
||||
+ )
|
||||
+
|
||||
target_link_libraries( gsttcamsrc
|
||||
PRIVATE
|
||||
${GSTREAMER_LIBRARIES}
|
||||
${GSTREAMER_BASE_LIBRARIES}
|
||||
+ ${GSTREAMER_VIDEO_LIBRARIES}
|
||||
|
||||
tcamgstbase
|
||||
tcam::gst-helper
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,25 @@ |
||||
From fdbc0b74812b9afd663226715375b5688e5408b5 Mon Sep 17 00:00:00 2001
|
||||
From: Raymond Gauthier <jraygauthier@gmail.com>
|
||||
Date: Thu, 9 Jun 2022 20:23:02 -0400
|
||||
Subject: [PATCH] udev/rules: fix install location
|
||||
|
||||
---
|
||||
CMakeInstall.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeInstall.cmake b/CMakeInstall.cmake
|
||||
index 4773091f..962c9b09 100644
|
||||
--- a/CMakeInstall.cmake
|
||||
+++ b/CMakeInstall.cmake
|
||||
@@ -92,7 +92,7 @@ else()
|
||||
|
||||
else()
|
||||
|
||||
- set(TCAM_INSTALL_UDEV "${CMAKE_INSTALL_PREFIX}/udev/rules.d" CACHE PATH "udev rules installation path" FORCE)
|
||||
+ set(TCAM_INSTALL_UDEV "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE PATH "udev rules installation path" FORCE)
|
||||
set(TCAM_INSTALL_SYSTEMD "${CMAKE_INSTALL_PREFIX}/lib/systemd/system/" CACHE PATH "systemd unit installation path" FORCE)
|
||||
|
||||
set(TCAM_INSTALL_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "pkgconfig installation path" FORCE)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Reference in new issue