From fd9f319b4571dcb45b2d8b6965d1c6709a611d05 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 16 Oct 2015 03:28:58 -0500 Subject: Ensure that libjpeg-turbo headers are included On some systems, the build was picking up jpeglib.h from the system include directories, and if the system's version of libjpeg[-turbo] used a different API/ABI version than the one specified in JPEG_LIBRARY, this led to a "Wrong JPEG library version" error at run time. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08ef25cc..904809c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,6 +199,8 @@ if(NOT FOUND_LIBJPEG_TURBO) message(STATUS "WARNING: You are not using libjpeg-turbo. Performance will suffer.") endif() +include_directories(${JPEG_INCLUDE_DIR}) + option(BUILD_JAVA "Build Java version of the TigerVNC Viewer" FALSE) if(BUILD_JAVA) add_subdirectory(java) -- cgit v1.2.3