Merge branch 'master' into mask-merger-destructor

9a55190e · Wieland Morgenstern · 8ca0c778 · 4e95c38b · 9a55190e · 9a55190e
Commit 9a55190e authored Aug 27, 2019 by Wieland Morgenstern
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

FUNDING.yml .github/FUNDING.yml +1 -0

libvideostitch_OpenCL.cmake lib/libvideostitch_OpenCL.cmake +1 -1

No files found.
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
+custom: https://www.helloasso.com/associations/stitchem/formulaires/1/en
--- a/lib/libvideostitch_OpenCL.cmake
+++ b/lib/libvideostitch_OpenCL.cmake
@@ -117,6 +117,6 @@ endif(DISABLE_OPENCL_SPIR)

 # different names on different implementations of find_package(OpenCL)
 vs_lib_link_libraries("PUBLIC_OPENCL" ${OpenCL_LIBRARIES})
-vs_lib_link_libraries("OPENCL" ${OpenGL_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GLEW})
+vs_lib_link_libraries("OPENCL" ${OpenGL_LIBRARIES} ${OPENGL_LIBRARIES} GLEW::GLEW)

 set(BACKEND_OBJECTS_OPENCL )