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

Fix IPPIW binaries search

Browse Source
This commit is contained in:
nmizonov
2026-03-02 05:03:50 -08:00
parent 83804b8fc7
commit b7266c92fd
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindIPPIW.cmake
+17 -3
View File
@@ -43,7 +43,12 @@ file(TO_CMAKE_PATH "${IPPROOT}" IPPROOT)
# This function detects Intel IPP Integration Wrappers version by analyzing .h file # This function detects Intel IPP Integration Wrappers version by analyzing .h file
macro(ippiw_setup PATH BUILD) macro(ippiw_setup PATH BUILD)
set(IPP_NEW_LAYOUT 0)
set(FILE "${PATH}/include/iw/iw_version.h") set(FILE "${PATH}/include/iw/iw_version.h")
if(NOT EXISTS "${FILE}")
set(IPP_NEW_LAYOUT 1)
set(FILE "${PATH}/include/ipp/iw/iw_version.h")
endif()
if(${BUILD}) if(${BUILD})
ippiw_debugmsg("Checking sources: ${PATH}") ippiw_debugmsg("Checking sources: ${PATH}")
else() else()
@@ -97,11 +102,20 @@ macro(ippiw_setup PATH BUILD)
endif() endif()
else() else()
# check binaries # check binaries
if(IPP_X64) if (IPP_NEW_LAYOUT)
set(FILE "${PATH}/lib/intel64/${CMAKE_STATIC_LIBRARY_PREFIX}ipp_iw${CMAKE_STATIC_LIBRARY_SUFFIX}") if(IPP_X64)
set(IW_LIB_DIR "${PATH}/lib")
else()
set(IW_LIB_DIR "${PATH}/lib32")
endif()
else() else()
set(FILE "${PATH}/lib/ia32/${CMAKE_STATIC_LIBRARY_PREFIX}ipp_iw${CMAKE_STATIC_LIBRARY_SUFFIX}") if(IPP_X64)
set(IW_LIB_DIR "${PATH}/lib/intel64")
else()
set(IW_LIB_DIR "${PATH}/lib/ia32")
endif()
endif() endif()
set(FILE "${IW_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}ipp_iw${CMAKE_STATIC_LIBRARY_SUFFIX}")
if(EXISTS ${FILE}) if(EXISTS ${FILE})
ippiw_debugmsg("binaries\tyes (64=${IPP_X64})") ippiw_debugmsg("binaries\tyes (64=${IPP_X64})")
set(IPP_IW_PATH "${PATH}") set(IPP_IW_PATH "${PATH}")
cmake/OpenCVModule.cmake
+1 -1
View File
@@ -992,7 +992,7 @@ macro(_ocv_create_module)
ocv_target_link_libraries(${the_module} PUBLIC ${OPENCV_MODULE_${the_module}_DEPS_EXT} ocv_target_link_libraries(${the_module} PUBLIC ${OPENCV_MODULE_${the_module}_DEPS_EXT}
INTERFACE ${OPENCV_MODULE_${the_module}_DEPS_EXT} INTERFACE ${OPENCV_MODULE_${the_module}_DEPS_EXT}
) )
ocv_target_link_libraries(${the_module} PRIVATE ${OPENCV_LINKER_LIBS} ${OPENCV_HAL_LINKER_LIBS} ${IPP_LIBS} ${ARGN}) ocv_target_link_libraries(${the_module} PRIVATE ${OPENCV_LINKER_LIBS} ${OPENCV_HAL_LINKER_LIBS} ${ARGN})
if (NOT ENABLE_CUDA_FIRST_CLASS_LANGUAGE AND HAVE_CUDA) if (NOT ENABLE_CUDA_FIRST_CLASS_LANGUAGE AND HAVE_CUDA)
ocv_target_link_libraries(${the_module} PRIVATE ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) ocv_target_link_libraries(${the_module} PRIVATE ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
endif() endif()
hal/ipp/CMakeLists.txt
+1 -1
View File
@@ -45,7 +45,7 @@ target_include_directories(ipphal PRIVATE
${IPP_INCLUDE_DIRS} ${IPP_INCLUDE_DIRS}
) )
target_link_libraries(ipphal PUBLIC ${IPP_IW_LIBRARY} ${IPP_LIBRARIES}) target_link_libraries(ipphal PUBLIC ${IPP_IW_LIBRARIES} ${IPP_LIBRARIES})
set_target_properties(ipphal PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}") set_target_properties(ipphal PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}")