Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
ded71715
Commit
ded71715
authored
May 02, 2020
by
Jeremy Tellaa
Committed by
jeremad
May 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(opencl): fix windows GLEW linking
parent
17677418
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
libvideostitch_OpenCL.cmake
lib/libvideostitch_OpenCL.cmake
+8
-2
No files found.
lib/libvideostitch_OpenCL.cmake
View file @
ded71715
...
@@ -66,7 +66,8 @@ set(CL_BACKEND_SOURCES
...
@@ -66,7 +66,8 @@ set(CL_BACKEND_SOURCES
if
(
NOT ANDROID
)
if
(
NOT ANDROID
)
find_package
(
OpenCL REQUIRED
)
find_package
(
OpenCL REQUIRED
)
if
(
WINDOWS
)
if
(
WINDOWS
)
find_library
(
GLEW NAMES glew32s PATHS
${
CMAKE_EXTERNAL_DEPS
}
/lib/GL NO_DEFAULT_PATH
)
find_library
(
GLEW
"glew32"
PATH
"
${
VCPKG_PATH
}
\\
${
VCPKG_TARGET_TRIPLET
}
-static
\\
lib"
NO_DEFAULT_PATH
)
include_directories
(
"
${
VCPKG_PATH
}
\\
${
VCPKG_TARGET_TRIPLET
}
-static
\\
include"
)
else
()
else
()
find_package
(
GLEW REQUIRED
)
find_package
(
GLEW REQUIRED
)
endif
()
endif
()
...
@@ -114,6 +115,11 @@ endif(DISABLE_OPENCL_SPIR)
...
@@ -114,6 +115,11 @@ endif(DISABLE_OPENCL_SPIR)
# different names on different implementations of find_package(OpenCL)
# different names on different implementations of find_package(OpenCL)
vs_lib_link_libraries
(
"PUBLIC_OPENCL"
${
OpenCL_LIBRARIES
}
)
vs_lib_link_libraries
(
"PUBLIC_OPENCL"
${
OpenCL_LIBRARIES
}
)
vs_lib_link_libraries
(
"OPENCL"
${
OpenGL_LIBRARIES
}
${
OPENGL_LIBRARIES
}
GLEW::GLEW
)
vs_lib_link_libraries
(
"OPENCL"
${
OpenGL_LIBRARIES
}
${
OPENGL_LIBRARIES
}
)
if
(
WINDOWS
)
vs_lib_link_libraries
(
"OPENCL"
${
GLEW
}
)
else
()
vs_lib_link_libraries
(
"OPENCL"
GLEW::GLEW
)
endif
()
set
(
BACKEND_OBJECTS_OPENCL
)
set
(
BACKEND_OBJECTS_OPENCL
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment