Revision: 4314
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4314&view=rev
Author: ossman_
Date: 2011-03-03 09:55:21 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Look for libjpeg in a more proper manner and don't just assume it's in a
standard path.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/common/rfb/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-03-03 09:44:49 UTC (rev 4313)
+++ trunk/CMakeLists.txt 2011-03-03 09:55:21 UTC (rev 4314)
@@ -93,6 +93,9 @@
set(USE_INCLUDED_ZLIB 1)
endif()
+# Check for libjpeg
+find_package(JPEG REQUIRED)
+
# Check for GNUTLS library
find_package(GnuTLS)
if(GNUTLS_FOUND)
Modified: trunk/common/rfb/CMakeLists.txt
===================================================================
--- trunk/common/rfb/CMakeLists.txt 2011-03-03 09:44:49 UTC (rev 4313)
+++ trunk/common/rfb/CMakeLists.txt 2011-03-03 09:55:21 UTC (rev 4314)
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/win)
+include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/win
${JPEG_INCLUDE_DIR})
set(RFB_SOURCES
Blacklist.cxx
@@ -65,7 +65,7 @@
encodings.cxx
util.cxx)
-set(RFB_LIBRARIES jpeg os)
+set(RFB_LIBRARIES ${JPEG_LIBRARIES} os)
if(GNUTLS_FOUND)
set(RFB_SOURCES
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
