Revision: 51922
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51922
Author: nazgul
Date: 2012-11-05 19:49:30 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Synchronize changes with trunk
Modified Paths:
--------------
branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt
Modified: branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt 2012-11-05
19:44:33 UTC (rev 51921)
+++ branches/soc-2011-tomato/intern/opencolorio/CMakeLists.txt 2012-11-05
19:49:30 UTC (rev 51922)
@@ -23,23 +23,23 @@
#
# ***** END GPL LICENSE BLOCK *****
- set(INC
- .
+set(INC
+ .
../guardedalloc
../../source/blender/blenlib
)
set(INC_SYS
- )
+)
- set(SRC
+set(SRC
ocio_capi.cc
fallback_impl.cc
- ocio_capi.h
+ ocio_capi.h
ocio_impl.h
- )
+)
if(WITH_OPENCOLORIO)
add_definitions(
@@ -52,12 +52,12 @@
list(APPEND SRC
ocio_impl.cc
-)
+ )
if(WIN32 AND NOT MINGW)
list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
-)
+ )
endif()
endif()
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
