Merge pull request #3410 from mgharbi:master

77be6d64 · Vadim Pisarevsky · bea86dee · 28103ad3 · 77be6d64
Commit 77be6d64 authored Nov 12, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OpenCVConfig.cmake.in cmake/templates/OpenCVConfig.cmake.in +3 -1

No files found.
--- a/cmake/templates/OpenCVConfig.cmake.in
+++ b/cmake/templates/OpenCVConfig.cmake.in
@@ -292,7 +292,9 @@ foreach(__opttype OPT DBG)
    set(OpenCV_CUDA_LIBS_RELPATH "")
    foreach(l ${OpenCV_CUDA_LIBS_ABSPATH})
      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()
    list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH)