Merge pull request #300 from goldhoorn/fix_turbojpeg

floe · floe · commit 44cc6e09f420 · 2015-06-17T15:35:27.000+02:00
Extended name of libtubrojpeg for debian packaging
diff --git a/examples/protonect/cmake_modules/FindTurboJPEG.cmake b/examples/protonect/cmake_modules/FindTurboJPEG.cmake
@@ -20,7 +20,7 @@ FIND_PATH(TurboJPEG_INCLUDE_DIRS
 )
 
 FIND_LIBRARY(TurboJPEG_LIBRARIES
-  NAMES libturbojpeg.so.0 turbojpeg
+  NAMES libturbojpeg.so.1 libturbojpeg.so.0 turbojpeg
   DOC "Found TurboJPEG library path"
   PATHS
     "${DEPENDS_DIR}/libjpeg_turbo"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ FIND_PATH(TurboJPEG_INCLUDE_DIRS`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`FIND_LIBRARY(TurboJPEG_LIBRARIES`
`23`		`- NAMES libturbojpeg.so.0 turbojpeg`
	`23`	`+ NAMES libturbojpeg.so.1 libturbojpeg.so.0 turbojpeg`
`24`	`24`	`DOC "Found TurboJPEG library path"`
`25`	`25`	`PATHS`
`26`	`26`	`"${DEPENDS_DIR}/libjpeg_turbo"`