]>
Commit | Line | Data |
---|---|---|
b9df10ac JB |
1 | --- OpenColorIO-1.1.0/src/core/OCIOYaml.cpp.orig 2018-01-05 02:38:27.000000000 +0100 |
2 | +++ OpenColorIO-1.1.0/src/core/OCIOYaml.cpp 2018-06-25 21:49:48.951035161 +0200 | |
3 | @@ -30,7 +30,7 @@ | |
15f9dc5e JR |
4 | |
5 | #include <OpenColorIO/OpenColorIO.h> | |
6 | ||
b9df10ac JB |
7 | -#ifndef WIN32 |
8 | +#if 0 | |
9 | ||
10 | // fwd declare yaml-cpp visibility | |
11 | #pragma GCC visibility push(hidden) | |
12 | --- OpenColorIO-1.1.0/CMakeLists.txt.orig 2018-06-26 05:31:36.084052127 +0200 | |
13 | +++ OpenColorIO-1.1.0/CMakeLists.txt 2018-06-26 19:16:47.136820152 +0200 | |
14 | @@ -271,7 +271,7 @@ | |
15 | mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) | |
16 | ||
17 | if(YAML_CPP_FOUND) | |
18 | - if(YAML_CPP_VERSION VERSION_GREATER "0.5.0") | |
19 | + if(YAML_CPP_VERSION VERSION_GREATER "0.5.0" AND YAML_CPP_VERSION VERSION_LESS "0.6.0") | |
20 | # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. | |
21 | # Don't bother doing this step if we are already including the boost headers for shared_ptr | |
22 | if(NOT OCIO_USE_BOOST_PTR) |