From 85e4d1c50aa70135388a0110a4c0972d24f3e03c Mon Sep 17 00:00:00 2001 From: Alex Fuller Date: Tue, 4 Feb 2020 20:23:51 -0800 Subject: [PATCH] Windows header fix, as Windows defines 'SearchPath' and the Cortex header makes sure to undef it but it needs to be the last header defined. --- src/GafferCyclesModule/GafferCyclesModule.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/GafferCyclesModule/GafferCyclesModule.cpp b/src/GafferCyclesModule/GafferCyclesModule.cpp index ff57a04..c002520 100644 --- a/src/GafferCyclesModule/GafferCyclesModule.cpp +++ b/src/GafferCyclesModule/GafferCyclesModule.cpp @@ -51,7 +51,6 @@ #include "GafferCycles/InteractiveCyclesRender.h" #include "IECore/MessageHandler.h" -#include "IECore/SearchPath.h" // Cycles #include "device/device.h" @@ -59,6 +58,9 @@ #include "util/util_logging.h" #include "util/util_path.h" +// Header needs to be here on Windows +#include "IECore/SearchPath.h" + namespace py = boost::python; using namespace GafferBindings; using namespace GafferDispatchBindings;