diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-30 10:30:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-30 10:30:41 +0300 |
| commit | 03a5eccc945497da3cffafdf050c17fb4ccf999c (patch) | |
| tree | b451841a8bb0e614184de8a530322f4e45736b51 /CMakeLists.txt | |
| parent | 84d39ab97bba5d4885a062363c8b3f3d28cb7da7 (diff) | |
| parent | 28d2148b09a2d975876f4418bd5ba15ab5edea8d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 40671071921..2f159d40dd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ endif() # Options # First platform specific non-cached vars -if(UNIX AND NOT APPLE) +if(UNIX AND NOT (APPLE OR HAIKU)) set(WITH_X11 ON) endif() |