[Bf-blender-cvs] [2b833c7] alembic: Alembic: Fix compilation error after recent task/threads changes

[Sergey Sharybin]

Commit: 2b833c7ae85ceccf852b0273e08747980ecaa574
Author: Sergey Sharybin
Date:   Wed Apr 29 14:40:56 2015 +0500
Branches: alembic
https://developer.blender.org/rB2b833c7ae85ceccf852b0273e08747980ecaa574

Alembic: Fix compilation error after recent task/threads changes

For some reason CMake worked just fine, but SCons was giving issues.

===================================================================

M	source/blender/pointcache/CMakeLists.txt
M	source/blender/pointcache/SConscript
M	source/blender/pointcache/alembic/CMakeLists.txt
M	source/blender/pointcache/alembic/SConscript

===================================================================

diff --git a/source/blender/pointcache/CMakeLists.txt b/source/blender/pointcache/CMakeLists.txt
index e89ccc9..2898785 100644
--- a/source/blender/pointcache/CMakeLists.txt
+++ b/source/blender/pointcache/CMakeLists.txt
@@ -54,6 +54,10 @@ set(SRC
 	PTC_api.cpp
 )
 
+if(NOT WITH_CPP11)
+	list(APPEND INC_SYS ${BOOST_INCLUDE_DIR})
+endif()
+
 if(WITH_ALEMBIC)
 	add_definitions(-DWITH_PTC_ALEMBIC)
 	add_subdirectory(alembic)
diff --git a/source/blender/pointcache/SConscript b/source/blender/pointcache/SConscript
index 4b18b6f..f94bbd4 100644
--- a/source/blender/pointcache/SConscript
+++ b/source/blender/pointcache/SConscript
@@ -42,6 +42,9 @@ incs = [
 
 defs = []
 
+if not env['WITH_BF_CPP11']:
+    incs.append(env['BF_BOOST_INC'])
+
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
diff --git a/source/blender/pointcache/alembic/CMakeLists.txt b/source/blender/pointcache/alembic/CMakeLists.txt
index 31dbff3..7bfa524 100644
--- a/source/blender/pointcache/alembic/CMakeLists.txt
+++ b/source/blender/pointcache/alembic/CMakeLists.txt
@@ -34,7 +34,6 @@ set(INC
 )
 
 set(INC_SYS
-	${BOOST_INCLUDE_DIR}
 	${ALEMBIC_INCLUDE_DIRS}
 	${OPENEXR_INCLUDE_DIR}/OpenEXR
 )
diff --git a/source/blender/pointcache/alembic/SConscript b/source/blender/pointcache/alembic/SConscript
index 47fbafe..b9da2df 100644
--- a/source/blender/pointcache/alembic/SConscript
+++ b/source/blender/pointcache/alembic/SConscript
@@ -54,6 +54,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
 incs.append(env['BF_OPENEXR_INC'])
 incs.append(env['BF_ALEMBIC_INC'])
 
+if not env['WITH_BF_CPP11']:
+    incs.append(env['BF_BOOST_INC'])
+
 defs.append('WITH_ALEMBIC')
 
 env.BlenderLib('bf_pointcache_alembic', sources, incs, defines=defs, libtype=['core','player'], priority=[901, 901])