|
 |
aa1e37e |
diff -up kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt.libjpeg_version kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt
|
|
|
aa1e37e |
--- kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt.libjpeg_version 2011-04-01 14:38:11.000000000 -0500
|
|
|
aa1e37e |
+++ kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt 2011-04-08 09:29:08.530982504 -0500
|
|
|
d88eb34 |
@@ -1,16 +1,21 @@
|
|
|
d88eb34 |
project(gwenviewlib)
|
|
|
d88eb34 |
|
|
|
d88eb34 |
-# Extract version of libjpeg so that we can use the appropriate dir
|
|
|
d88eb34 |
+# check version of libjpeg so that we can use the appropriate dir
|
|
|
d88eb34 |
# See bug #227313
|
|
|
d88eb34 |
-file(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
|
|
|
d88eb34 |
-string(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
|
|
|
d88eb34 |
-message(STATUS "libjpeg version: ${jpeglib_version}")
|
|
|
d88eb34 |
-
|
|
|
d88eb34 |
-if ("${jpeglib_version}" LESS 80)
|
|
|
d88eb34 |
- set(GV_JPEG_DIR libjpeg-62)
|
|
|
d88eb34 |
-else ("${jpeglib_version}" LESS 80)
|
|
|
d88eb34 |
- set(GV_JPEG_DIR libjpeg-80)
|
|
|
d88eb34 |
-endif ("${jpeglib_version}" LESS 80)
|
|
|
d88eb34 |
+set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n")
|
|
|
d88eb34 |
+set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp)
|
|
|
d88eb34 |
+file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}")
|
|
|
d88eb34 |
+set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}")
|
|
|
d88eb34 |
+
|
|
|
d88eb34 |
+try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var)
|
|
|
d88eb34 |
+
|
|
|
d88eb34 |
+if(_jpeglib_version_compile_result)
|
|
|
d88eb34 |
+MESSAGE(STATUS "Identified libjpeg version: 62")
|
|
|
d88eb34 |
+set(GV_JPEG_DIR libjpeg-62)
|
|
|
d88eb34 |
+else(_jpeglib_version_compile_result)
|
|
|
d88eb34 |
+MESSAGE(STATUS "Identified libjpeg version: 80+")
|
|
|
d88eb34 |
+set(GV_JPEG_DIR libjpeg-80)
|
|
|
d88eb34 |
+endif(_jpeglib_version_compile_result)
|
|
|
d88eb34 |
|
|
|
aa1e37e |
add_definitions(-Dlibjpeg_EXPORTS)
|
|
|
d88eb34 |
include_directories(
|