potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

3rdparty: integrate libjpeg-turbo build scripts into OpenCV

Browse Source
This commit is contained in:
Alexander Alekhin
2018-05-10 17:02:24 +03:00
parent 777953923e
commit f8252702a8
7 changed files with 96 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindLibsGrfmt.cmake
+28 -5
View File
@@ -36,13 +36,36 @@ if(WITH_JPEG)
if(NOT JPEG_FOUND)
ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
set(JPEG_LIBRARY libjpeg)
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
if(NOT BUILD_JPEG_TURBO_DISABLE)
set(JPEG_LIBRARY libjpeg-turbo)
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg-turbo")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}/src")
else()
set(JPEG_LIBRARY libjpeg)
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
endif()
endif()
ocv_parse_header("${JPEG_INCLUDE_DIR}/jpeglib.h" JPEG_VERSION_LINES JPEG_LIB_VERSION)
macro(ocv_detect_jpeg_version header_file)
if(NOT DEFINED JPEG_LIB_VERSION AND EXISTS "${header_file}")
ocv_parse_header("${header_file}" JPEG_VERSION_LINES JPEG_LIB_VERSION)
endif()
endmacro()
ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jpeglib.h")
if(DEFINED CMAKE_CXX_LIBRARY_ARCHITECTURE)
ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/jconfig.h")
endif()
# no needed for strict platform check here, both files 64/32 should contain the same version
ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jconfig-64.h")
ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jconfig-32.h")
ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jconfig.h")
ocv_detect_jpeg_version("${${JPEG_LIBRARY}_BINARY_DIR}/jconfig.h")
if(NOT DEFINED JPEG_LIB_VERSION)
set(JPEG_LIB_VERSION "unknown")
endif()
set(HAVE_JPEG YES)
endif()