Merge pull request from mgharbi:master

This commit is contained in:
Vadim Pisarevsky 2014-11-12 08:49:50 +00:00
commit 77be6d64c1

@ -292,7 +292,9 @@ foreach(__opttype OPT DBG)
set(OpenCV_CUDA_LIBS_RELPATH "") set(OpenCV_CUDA_LIBS_RELPATH "")
foreach(l ${OpenCV_CUDA_LIBS_ABSPATH}) foreach(l ${OpenCV_CUDA_LIBS_ABSPATH})
get_filename_component(_tmp ${l} PATH) get_filename_component(_tmp ${l} PATH)
list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp}) if(NOT ${_tmp} MATCHES "-Wl.*")
list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp})
endif()
endforeach() endforeach()
list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH) list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH)