[CMake fixes] Linux X11 pixel format and Windows compilation fix

[CMake fixes] Linux X11 pixel format and Windows compilation fix

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1835573002

Committed: https://skia.googlesource.com/skia/+/cce49271124ff75c880dc0dfed1489f02c82890b

[Marco A., 2016-03-25 14:07:14]

Description was changed from

==========
[CMake fixes] Linux X11 pixel format and Windows compilation fix

BUG=skia:
==========

to

==========
[CMake fixes] Linux X11 pixel format and Windows compilation fix

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[Marco A., 2016-03-25 14:10:26]

marco.diiga@gmail.com changed reviewers:
+ mtklein@google.com

[Marco A., 2016-03-25 14:10:27]

https://codereview.chromium.org/1835573002/diff/1/cmake/CMakeLists.txt
File cmake/CMakeLists.txt (right):

https://codereview.chromium.org/1835573002/diff/1/cmake/CMakeLists.txt#newcod...
cmake/CMakeLists.txt:251: list (APPEND public_defines   "-DSK_BUILD_FOR_WIN32")
Specifically this is needed when compiling on a Windows machine by sk_setenv()
in src/ports/SkOSEnvironment.cpp

https://codereview.chromium.org/1835573002/diff/1/cmake/SkUserConfig.h.in
File cmake/SkUserConfig.h.in (right):

https://codereview.chromium.org/1835573002/diff/1/cmake/SkUserConfig.h.in#new...
cmake/SkUserConfig.h.in:15: #if ${SK_SAMPLES_FOR_X}
This was already in place in gypi files. Causes massive troubles with CMake
though.

[mtklein, 2016-03-25 14:15:12]

https://codereview.chromium.org/1835573002/diff/1/cmake/CMakeLists.txt
File cmake/CMakeLists.txt (right):

https://codereview.chromium.org/1835573002/diff/1/cmake/CMakeLists.txt#newcod...
cmake/CMakeLists.txt:251: list (APPEND public_defines   "-DSK_BUILD_FOR_WIN32")
On 2016/03/25 14:10:27, Marco A. wrote:
> Specifically this is needed when compiling on a Windows machine by sk_setenv()
> in src/ports/SkOSEnvironment.cpp

Let's have src/ports/SkOSEnvironment.cpp #include "SkTypes.h", which should
auto-define this.

[Marco A., 2016-03-25 14:29:26]

On 2016/03/25 14:15:12, mtklein wrote:
> https://codereview.chromium.org/1835573002/diff/1/cmake/CMakeLists.txt
> File cmake/CMakeLists.txt (right):
> 
>
https://codereview.chromium.org/1835573002/diff/1/cmake/CMakeLists.txt#newcod...
> cmake/CMakeLists.txt:251: list (APPEND public_defines  
"-DSK_BUILD_FOR_WIN32")
> On 2016/03/25 14:10:27, Marco A. wrote:
> > Specifically this is needed when compiling on a Windows machine by
sk_setenv()
> > in src/ports/SkOSEnvironment.cpp
> 
> Let's have src/ports/SkOSEnvironment.cpp #include "SkTypes.h", which should
> auto-define this.

Updated. Thanks.

[Marco A., 2016-03-25 14:31:11]

https://codereview.chromium.org/1835573002/diff/20001/src/ports/SkOSEnvironme...
File src/ports/SkOSEnvironment.cpp (left):

https://codereview.chromium.org/1835573002/diff/20001/src/ports/SkOSEnvironme...
src/ports/SkOSEnvironment.cpp:3: * Copyright 2015 Google Inc.
As a sidenote, no idea why diff didn't work here. Newline formats perhaps?

[mtklein, 2016-03-25 15:16:10]

lgtm

https://codereview.chromium.org/1835573002/diff/20001/src/ports/SkOSEnvironme...
File src/ports/SkOSEnvironment.cpp (left):

https://codereview.chromium.org/1835573002/diff/20001/src/ports/SkOSEnvironme...
src/ports/SkOSEnvironment.cpp:3: * Copyright 2015 Google Inc.
On 2016/03/25 14:31:11, Marco A. wrote:
> As a sidenote, no idea why diff didn't work here. Newline formats perhaps?

Yes, I think this happens when you upload from Windows.  The side-by-side diff
link works.

[mtklein, 2016-03-25 15:46:30]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2016-03-25 15:46:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1835573002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1835573002/20001

[commit-bot: I haz the power, 2016-03-25 16:01:28]

Description was changed from

==========
[CMake fixes] Linux X11 pixel format and Windows compilation fix

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
[CMake fixes] Linux X11 pixel format and Windows compilation fix

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/cce49271124ff75c880dc0dfed1489f02c82890b
==========

[commit-bot: I haz the power, 2016-03-25 16:01:29]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/cce49271124ff75c880dc0dfed1489f02c82890b