Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16769 from mshabunin:fix-ipp-install

Browse Source 
* Do not copy standalone IPP libraries to install for static builds

* Restored IPP installation under option
pull/17102/head
Maksim Shabunin 5 years ago committed by GitHub
parent d4fc302c7e
commit 2840362868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cmake/OpenCVFindIPP.cmake
  2. 9
      cmake/OpenCVFindIPPIW.cmake

2
cmake/OpenCVFindIPP.cmake
Unescape View File

@ -148,7 +148,7 @@ macro(ipp_detect_version)
IMPORTED_LOCATION ${IPP_LIBRARY_DIR}/${IPP_LIB_PREFIX}${IPP_PREFIX}${name}${IPP_SUFFIX}${IPP_LIB_SUFFIX} IMPORTED_LOCATION ${IPP_LIBRARY_DIR}/${IPP_LIB_PREFIX}${IPP_PREFIX}${name}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
) )
list(APPEND IPP_LIBRARIES ipp${name}) list(APPEND IPP_LIBRARIES ipp${name})
if (NOT BUILD_SHARED_LIBS) if (NOT BUILD_SHARED_LIBS AND (HAVE_IPP_ICV OR ";${OPENCV_INSTALL_EXTERNAL_DEPENDENCIES};" MATCHES ";ipp;"))
# CMake doesn't support "install(TARGETS ${IPP_PREFIX}${name} " command with imported targets # CMake doesn't support "install(TARGETS ${IPP_PREFIX}${name} " command with imported targets
install(FILES ${IPP_LIBRARY_DIR}/${IPP_LIB_PREFIX}${IPP_PREFIX}${name}${IPP_SUFFIX}${IPP_LIB_SUFFIX} install(FILES ${IPP_LIBRARY_DIR}/${IPP_LIB_PREFIX}${IPP_PREFIX}${name}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev) DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)

9
cmake/OpenCVFindIPPIW.cmake
Unescape View File

@ -108,12 +108,13 @@ macro(ippiw_setup PATH BUILD)
message(STATUS "found Intel IPP Integration Wrappers binaries: ${IW_VERSION_MAJOR}.${IW_VERSION_MINOR}.${IW_VERSION_UPDATE}") message(STATUS "found Intel IPP Integration Wrappers binaries: ${IW_VERSION_MAJOR}.${IW_VERSION_MINOR}.${IW_VERSION_UPDATE}")
message(STATUS "at: ${IPP_IW_PATH}") message(STATUS "at: ${IPP_IW_PATH}")
add_library(ippiw STATIC IMPORTED) add_library(ipp_iw STATIC IMPORTED)
set_target_properties(ippiw PROPERTIES set_target_properties(ipp_iw PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES "" IMPORTED_LINK_INTERFACE_LIBRARIES ""
IMPORTED_LOCATION "${FILE}" IMPORTED_LOCATION "${FILE}"
) )
if (NOT BUILD_SHARED_LIBS)
if (NOT BUILD_SHARED_LIBS AND ";${OPENCV_INSTALL_EXTERNAL_DEPENDENCIES};" MATCHES ";ipp;")
# CMake doesn't support "install(TARGETS ${name} ...)" command with imported targets # CMake doesn't support "install(TARGETS ${name} ...)" command with imported targets
install(FILES "${FILE}" install(FILES "${FILE}"
DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev) DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
@ -122,7 +123,7 @@ macro(ippiw_setup PATH BUILD)
endif() endif()
set(IPP_IW_INCLUDES "${IPP_IW_PATH}/include") set(IPP_IW_INCLUDES "${IPP_IW_PATH}/include")
set(IPP_IW_LIBRARIES ippiw) set(IPP_IW_LIBRARIES ipp_iw)
set(HAVE_IPP_IW 1) set(HAVE_IPP_IW 1)
set(BUILD_IPP_IW 0) set(BUILD_IPP_IW 0)

Write Preview
Loading…
Cancel
Save