diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-28 18:48:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-28 18:48:59 +0300 |
| commit | 8ead56c4c974ea3f7481be61c74a0bbd5b8cde83 (patch) | |
| tree | 80a55f0ac146c8379a14397649c6d57623f5cf50 /intern/opencolorio | |
| parent | 6dfe56f01a2bac39e848316bcfa6882318768c3b (diff) | |
| parent | b947810291b16d3f304e2cd59f94c96c5f6e6f51 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index d2dd8a3c419..2611477252a 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -60,7 +60,7 @@ if(WITH_OPENCOLORIO) ocio_impl_glsl.cc ) - if(WIN32 AND NOT MINGW) + if(WIN32) list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} ) |