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

Fixing #1580

Browse Source
This commit is contained in:
Andrey Kamaev 2012-02-03 19:18:35 +00:00
parent fdc1e87ddf
commit dfb161e9c9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/OpenCVGenAndroidMK.cmake
View File

@ -52,7 +52,9 @@ if(ANDROID)
list(INSERT OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE 0 ${mod})
endif()
endforeach()
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE ${OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE})
if(OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE)
list(REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE ${OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE})
endif()
# convert CMake lists to makefile literals
foreach(lst OPENCV_MODULES_CONFIGMAKE OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE OPENCV_EXTRA_COMPONENTS_CONFIGMAKE)

6
cmake/OpenCVModule.cmake
View File

@ -299,6 +299,12 @@ macro(ocv_glob_modules)
if(m MATCHES "^opencv_")
string(REGEX REPLACE "^opencv_" "" __shortname "${m}")
add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" "${CMAKE_CURRENT_BINARY_DIR}/${__shortname}")
#workaround for link_directories inheritance
get_directory_property(__lnkfix DIRECTORY "${OPENCV_MODULE_${m}_LOCATION}" LINK_DIRECTORIES)
if(__lnkfix)
link_directories(${__lnkfix})
endif()
endif()
endforeach()
unset(__shortname)