[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48847] branches/soc-2012-bratwurst/extern /assimp/CMakeLists.txt: - ext_assimp: fix CMake boost auto-config.

[Alexander Gessler]

Revision: 48847
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48847
Author:   aramis_acg
Date:     2012-07-12 01:14:56 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
- ext_assimp: fix CMake boost auto-config. Now takes system boost if WITH_BOOST and assimp's boost workaround otherwise. Also fix stupid typo.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/extern/assimp/CMakeLists.txt

Modified: branches/soc-2012-bratwurst/extern/assimp/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/extern/assimp/CMakeLists.txt	2012-07-11 21:57:11 UTC (rev 48846)
+++ branches/soc-2012-bratwurst/extern/assimp/CMakeLists.txt	2012-07-12 01:14:56 UTC (rev 48847)
@@ -529,8 +529,19 @@
 
 add_definitions(-DASSIMP_BUILD_NO_COLLADA_IMPORTER)
 add_definitions(-DASSIMP_BUILD_NO_BLEND_IMPORTER)
-add_definitions(-Icode/BoostWorkaround/)
 
-blender_add_lib(extern_assimp "${SRC}" "${INC}" "$(INC_SYS)")
+if(WITH_BOOST)
+	list(APPEND INC
+		${BOOST_INCLUDE_DIR}
+	)
+else()
+	add_definitions(-DASSIMP_BUILD_BOOST_WORKAROUND)
 
+	list(APPEND INC
+		code/BoostWorkaround/
+	)
+endif()
 
+blender_add_lib(extern_assimp "${SRC}" "${INC}" "${INC_SYS}")
+
+