diff options
| author | DRC <information@virtualgl.org> | 2015-10-16 03:28:58 -0500 |
|---|---|---|
| committer | DRC <information@virtualgl.org> | 2015-10-16 03:28:58 -0500 |
| commit | fd9f319b4571dcb45b2d8b6965d1c6709a611d05 (patch) | |
| tree | 677d40991cec1b193abb926003c7fe1c0a5700f8 | |
| parent | f4a971edf41032da98b4b00334be24f637e21540 (diff) | |
| download | tigervnc-fd9f319b4571dcb45b2d8b6965d1c6709a611d05.tar.gz tigervnc-fd9f319b4571dcb45b2d8b6965d1c6709a611d05.zip | |
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.
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
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) |