diff -up kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt.libjpeg-version kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt
--- kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt.libjpeg-version 2011-01-18 22:25:18.000000000 +0100
+++ kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt 2011-01-21 18:36:32.538402437 +0100
@@ -1,19 +1,8 @@
project(gwenviewlib)
-# Extract version of libjpeg so that we can use the appropriate dir
-# See bug #227313
-file(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
-string(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
-message(STATUS "libjpeg version: ${jpeglib_version}")
-
-if ("${jpeglib_version}" LESS 80)
- set(GV_JPEG_DIR libjpeg-62)
-else ("${jpeglib_version}" LESS 80)
- set(GV_JPEG_DIR libjpeg-80)
-endif ("${jpeglib_version}" LESS 80)
-
+# hardcode libjpeg version to 62
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-62
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}
${SOPRANO_INCLUDE_DIR}
@@ -104,7 +93,7 @@ set(gwenviewlib_SRCS
widgetfloater.cpp
zoomslider.cpp
zoomwidget.cpp
- ${GV_JPEG_DIR}/transupp.c
+ libjpeg-62/transupp.c
)
if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)