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

Unified Diff: cmake/CMakeLists.txt

Issue 1835573002: [CMake fixes] Linux X11 pixel format and Windows compilation fix (Closed) Base URL: git@github.com:google/skia.git@master
Patch Set: added SkTypes.h Created 4 years, 9 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 | cmake/SkUserConfig.h.in » ('j') | src/ports/SkOSEnvironment.cpp » ('J')
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 b375e59f453731ef58a1fc70ad12f04c0f58729f..dfdfb350b54c331f00c11186a1851a3dfee5cfc7 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -292,6 +292,11 @@ if (CMAKE_BUILD_TYPE STREQUAL Release)
else()
set (SK_RELEASE 0)
endif()
+if (UNIX AND NOT APPLE)
+ set (SK_SAMPLES_FOR_X 1)
+else()
+ set (SK_SAMPLES_FOR_X 0)
+endif()
configure_file ("SkUserConfig.h.in" "${userconfig_directory}/SkUserConfig.h")
# skia_link_arguments.txt
« no previous file with comments | « no previous file | cmake/SkUserConfig.h.in » ('j') | src/ports/SkOSEnvironment.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698