Fixed build of opencv_world with QT on linux #2012
This commit is contained in:
parent
8231d0d11d
commit
5a41c6509e
@ -52,7 +52,12 @@ foreach(m ${OPENCV_MODULE_${the_module}_DEPS})
|
|||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
if(IS_ABSOLUTE "${srcname}")
|
if(IS_ABSOLUTE "${srcname}")
|
||||||
file(RELATIVE_PATH srcname "${OPENCV_MODULE_${m}_LOCATION}" "${srcname}")
|
if(srcname MATCHES "/(qrc|moc)_[^/]*\\.cxx$")
|
||||||
|
# QT generated sources
|
||||||
|
file(RELATIVE_PATH srcname "${${m}_BINARY_DIR}" "${srcname}")
|
||||||
|
else()
|
||||||
|
file(RELATIVE_PATH srcname "${OPENCV_MODULE_${m}_LOCATION}" "${srcname}")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
string(REPLACE ".." "__" srcname "${srcname}")
|
string(REPLACE ".." "__" srcname "${srcname}")
|
||||||
get_filename_component(srcname_we ${srcname} NAME_WE)
|
get_filename_component(srcname_we ${srcname} NAME_WE)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user