Revision: 4466
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4466&view=rev
Author: dcommander
Date: 2011-06-07 01:47:38 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
If JPEG_INCLUDE_DIR or JPEG_LIBRARY have been overridden on the CMake command
line (necessary when building against the libjpeg-turbo SDK, which is installed
in /opt/libjpeg-turbo), then use the overridden values when performing the test
to determine whether or not the JPEG library is libjpeg-turbo.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-06-06 21:33:08 UTC (rev 4465)
+++ trunk/CMakeLists.txt 2011-06-07 01:47:38 UTC (rev 4466)
@@ -166,7 +166,13 @@
find_package(JPEG REQUIRED)
# Warn if it doesn't seem to be the accelerated libjpeg that's found
+set(CMAKE_REQUIRED_LIBRARIES_OLD ${CMAKE_REQUIRED_LIBRARIES})
+set(CMAKE_REQUIRED_FLAGS_OLD ${CMAKE_REQUIRED_FLAGS})
+set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
+set(CMAKE_REQUIRED_FLAGS -I${JPEG_INCLUDE_DIR})
check_c_source_compiles("#include <stdio.h>\n#include <jpeglib.h>\nint
main(int c, char** v) { return JCS_EXT_RGBX; }" FOUND_JPEG_TURBO)
+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_OLD})
+set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_OLD})
if(NOT FOUND_JPEG_TURBO)
message(STATUS "WARNING: You are not using libjpeg-turbo. Performance will
suffer.")
endif()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
