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

Merge pull request #25650 from sturkmen72:libjpeg-turbo

Browse Source 
minor cosmetic changes
This commit is contained in:
Alexander Smorkalov
2024-05-27 13:32:08 +03:00
committed by GitHub
parent 1fa96b161f 8955a27577
commit f1890e384b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/libjpeg-turbo/CMakeLists.txt
Vendored
+3 -1
View File
@@ -249,7 +249,9 @@ set_target_properties(${JPEG_LIBRARY}
)
if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${JPEG_LIBRARY} PROPERTIES FOLDER "3rdparty")
set_target_properties(${JPEG_LIBRARY} PROPERTIES FOLDER "3rdparty/jpeg")
set_target_properties(jpeg12-static PROPERTIES FOLDER "3rdparty/jpeg")
set_target_properties(jpeg16-static PROPERTIES FOLDER "3rdparty/jpeg")
endif()
if(NOT BUILD_SHARED_LIBS)
3rdparty/libjpeg-turbo/src/simd/CMakeLists.txt
Vendored
+4 -1
View File
@@ -2,7 +2,7 @@ macro(simd_fail message)
if(REQUIRE_SIMD)
message(FATAL_ERROR "${message}.")
else()
message(WARNING "${message}. Performance will suffer.")
message(STATUS "${message}. Performance will suffer.")
set(WITH_SIMD 0 PARENT_SCOPE)
endif()
endmacro()
@@ -211,6 +211,9 @@ if(MSVC_IDE OR XCODE)
add_library(simd OBJECT ${CPU_TYPE}/jsimd.c)
add_custom_target(simd-objs DEPENDS ${SIMD_OBJS})
add_dependencies(simd simd-objs)
set_target_properties(simd PROPERTIES FOLDER "3rdparty/jpeg")
set_target_properties(simd-objs PROPERTIES FOLDER "3rdparty/jpeg")
set_target_properties(jsimdcfg PROPERTIES FOLDER "3rdparty/jpeg")
else()
add_library(simd OBJECT ${SIMD_SOURCES} ${CPU_TYPE}/jsimd.c)
endif()