generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2709 from alalek:icv_update_binary_pack

Browse Source
This commit is contained in:
Alexander Alekhin
2014-05-23 15:09:43 +04:00
committed by OpenCV Buildbot
parent c43e32854a df9aa8898d
commit ab2749d648
4 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/templates/OpenCVConfig.cmake.in
View File

@@ -49,6 +49,18 @@ if(NOT DEFINED OpenCV_MODULES_SUFFIX)
endif()
endif()
if(@USE_IPPICV@) # value is defined by package builder
if(NOT TARGET ippicv)
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_PATH_RELATIVE_IPPICV@")
add_library(ippicv STATIC IMPORTED)
set_target_properties(ippicv PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES ""
IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_PATH_RELATIVE_IPPICV@"
)
endif()
endif()
endif()
if(NOT TARGET opencv_core)
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake)
endif()