Skip to content

Compile errors removed with Boost 1.65 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gmke wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Compile errors removed with Boost 1.65 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1fe85f7
Update DetectionTemporal.cpp
gmke Sep 5, 2017
79d2bb7
Update ExposureControl.cpp
gmke Sep 5, 2017
421b885
Update DetThread.cpp
gmke Sep 5, 2017
ef461b4
Update Findaravis.cmake
gmke Sep 5, 2017
951f8de
terminal output updated with escape sequences to get a better status …
gmke Sep 13, 2017
909b0a3
set packet size in camera initialization
gmke Sep 13, 2017
4d6151c
added check for gv camera before setting packet size, code copied fro…
gmke Sep 14, 2017
c5c07de
update to aravis-0.6
gmke Sep 20, 2017
fbb4f21
Update for Ubuntu 18.4 LTS
gmke Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
936 changes: 936 additions & 0 deletions Makefile.in
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions acx_opencv.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ if test x$acx_opencv_ok = xyes; then
if test x$1 = x; then
AC_CHECK_LIB(opencv_calib3d, main,, [acx_opencv_ok=no],
[-lopencv_calib3d])
AC_CHECK_LIB(opencv_contrib, main,, [acx_opencv_ok=no],
[-lopencv_contrib])
# AC_CHECK_LIB(opencv_contrib, main,, [acx_opencv_ok=no],
# [-lopencv_contrib])
AC_CHECK_LIB(opencv_core, main,, [acx_opencv_ok=no],
[-lopencv_core])
AC_CHECK_LIB(opencv_features2d, main,, [acx_opencv_ok=no],
Expand All @@ -87,14 +87,18 @@ if test x$acx_opencv_ok = xyes; then
[-lopencv_highgui])
AC_CHECK_LIB(opencv_imgproc, main,, [acx_opencv_ok=no],
[-lopencv_imgproc])
AC_CHECK_LIB(opencv_legacy, main,, [acx_opencv_ok=no],
[-lopencv_legacy])
AC_CHECK_LIB(opencv_imgcodecs, main,, [acx_opencv_ok=no],
[-lopencv_imgcodecs])
# AC_CHECK_LIB(opencv_legacy, main,, [acx_opencv_ok=no],
# [-lopencv_legacy])
AC_CHECK_LIB(opencv_ml, main,, [acx_opencv_ok=no],
[-lopencv_ml])
AC_CHECK_LIB(opencv_objdetect, main,, [acx_opencv_ok=no],
[-lopencv_objdetect])
AC_CHECK_LIB(opencv_video, main,, [acx_opencv_ok=no],
[-lopencv_video])
AC_CHECK_LIB(opencv_videoio, main,, [acx_opencv_ok=no],
[-lopencv_videoio])
if test x$acx_opencv_ok = xyes; then
OPENCV_LIBPATH=""
else
Expand All @@ -106,8 +110,8 @@ dnl Specific libdir specified
dnl -------------------------
AC_CHECK_LIB(opencv_calib3d, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_calib3d])
AC_CHECK_LIB(opencv_contrib, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_contrib])
# AC_CHECK_LIB(opencv_contrib, main,, [acx_opencv_ok=no],
# [-L$1 -lopencv_contrib])
AC_CHECK_LIB(opencv_core, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_core])
AC_CHECK_LIB(opencv_features2d, main,, [acx_opencv_ok=no],
Expand All @@ -118,14 +122,18 @@ dnl -------------------------
[-L$1 -lopencv_highgui])
AC_CHECK_LIB(opencv_imgproc, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_imgproc])
AC_CHECK_LIB(opencv_legacy, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_legacy])
AC_CHECK_LIB(opencv_imgcodecs, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_imgcodecs])
# AC_CHECK_LIB(opencv_legacy, main,, [acx_opencv_ok=no],
# [-L$1 -lopencv_legacy])
AC_CHECK_LIB(opencv_ml, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_ml])
AC_CHECK_LIB(opencv_objdetect, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_objdetect])
AC_CHECK_LIB(opencv_video, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_video])
AC_CHECK_LIB(opencv_videoio, main,, [acx_opencv_ok=no],
[-L$1 -lopencv_videoio])
if test x$acx_opencv_ok = xyes; then
OPENCV_LIBPATH="-L$1"
else
Expand All @@ -143,7 +151,7 @@ dnl -------------------------------------------------------------------------
if test x"$acx_opencv_ok" = xyes; then
AC_DEFINE(HAVE_OPENCV,1,
[Define if you have the OpenCV libraries and header files.])
OPENCV_LIBS="$OPENCV_LIBPATH -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d -lopencv_flann -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_objdetect -lopencv_video"
OPENCV_LIBS="$OPENCV_LIBPATH -lopencv_calib3d -lopencv_core -lopencv_features2d -lopencv_flann -lopencv_highgui -lopencv_imgproc -lopencv_imgcodecs -lopencv_ml -lopencv_objdetect -lopencv_video -lopencv_videoio"
LIBS="$OLIBS"
AC_SUBST(OPENCV_LIBS)
$3
Expand Down
4 changes: 2 additions & 2 deletions acx_pylon.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ acx_pylon_ok=no
dnl --------------------
dnl Search include files
dnl --------------------
def_pylon=/opt/pylon3
def_pylon=/opt/pylon5
def_inc=$def_pylon/include
geni_inc=$def_pylon/genicam/library/CPP/include
if test x$2 = x; then
Expand Down Expand Up @@ -72,7 +72,7 @@ fi
dnl --------------------
dnl Search library files
dnl --------------------
def_lib=/opt/pylon3
def_lib=/opt/pylon5
genicam_lib=genicam/bin/Linux64_x64
lib=lib64
if test x$acx_pylon_ok = xyes; then
Expand Down
Loading