Fixed Linux test program builds: now linking with locally built turbo…

…jpeg-static instead of system turbojpeg
openpnp · May 4, 2020 · 9321372 · 9321372
1 parent db70bde
commit 9321372
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -69,6 +69,7 @@ OpenPnP Capture is a cross platform video capture library with a focus on machin
 * MAKE (osx, linux)
 * Visual Studio 2013 + NMake or Ninja Build (windows)
 * NASM for building libjpeg-turbo (linux)
+* libgtk-3-dev (linux, test program)
 
 ### Build instructions (Windows)
 Run the batch file 'bootstrap.bat' and choose the desired build system (VisualStudio/nmake or Ninja). Make sure the compiler (Visual Studio) is in the search path. 

diff --git a/linux/tests/CMakeLists.txt b/linux/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(../include ..)
 add_executable(openpnp-capture-test ${SOURCE})
 
 target_link_libraries(openpnp-capture-test openpnp-capture)
-target_link_libraries(openpnp-capture-test turbojpeg)
+target_link_libraries(openpnp-capture-test turbojpeg-static)
 
 ########################################################
 ### GTK test application
@@ -41,5 +41,5 @@ set (SOURCE2 gtkmain.cpp ../../common/logging.cpp)
 add_executable(oc-gtk ${SOURCE2})
 
 target_link_libraries(oc-gtk openpnp-capture)
-target_link_libraries(oc-gtk turbojpeg)
+target_link_libraries(oc-gtk turbojpeg-static)
 target_link_libraries(oc-gtk ${GTK3_LIBRARIES})