]> source.dussan.org Git - tigervnc.git/commitdiff
Ensure that libjpeg-turbo headers are included 222/head
authorDRC <information@virtualgl.org>
Fri, 16 Oct 2015 08:28:58 +0000 (03:28 -0500)
committerDRC <information@virtualgl.org>
Fri, 16 Oct 2015 08:28:58 +0000 (03:28 -0500)
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

index 08ef25ccd0350cb1ca5e9e7a11a9f67566eb3f2e..904809c284b4e393ca89095c1bbc1b352d751caf 100644 (file)
@@ -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)