diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-09 05:56:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-09 05:56:49 +0300 |
| commit | 9b9861578d9f9e61ecdb0d0753df5df1e376ecb7 (patch) | |
| tree | 34fc6ad7955b7be37ca3120247aa80aab5f7c9e8 /extern | |
| parent | 518d59970df80fa5ad75c2cb5e5093826f175b29 (diff) | |
| parent | 8f9386596fb0471c972921e6543b3a0adc3ffb3d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/glog/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index 15e6aff9714..32f4dca77e8 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -40,6 +40,7 @@ set(SRC src/config.h src/config_freebsd.h + src/config_haiku.h src/config_hurd.h src/config_linux.h src/config_mac.h |