Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: cmake/CMakeLists.txt

Issue 1320443009: Cmake: fix to make linking work on Ubuntu (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cmake/CMakeLists.txt
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index ea98cd145fcb07247da5bdd8562adc7ffdb58b70..5439fb77a03b291e1159f3d81310d015ba7b0be3 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -196,6 +196,9 @@ if (APPLE)
list (APPEND libs ${APPLICATION_SERVICES_FRAMEWORK})
endif()
+find_package(OpenGL REQUIRED)
+list (APPEND libs ${OPENGL_LIBRARIES})
+
# This is our main output, libskia.so.
# We mostly build an .so here because it helps test we've linked everything,
# not so much that we think Skia is a good candidate to ship as a shared library.
@@ -220,6 +223,5 @@ set_target_properties(skia PROPERTIES
VISIBILITY_INLINES_HIDDEN true)
# Now build a simple example app that uses Skia via libskia.so.
-find_package(OpenGL REQUIRED)
add_executable(example example.cpp)
target_link_libraries(example skia ${OPENGL_LIBRARIES})
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698