[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48578] branches/soc-2011-tomato: fix staic OCIO with cmake and a little correction in scons)

[jens verwiebe]

Revision: 48578
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48578
Author:   jensverwiebe
Date:     2012-07-04 08:39:57 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
fix staic OCIO with cmake and a little correction in scons)

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-07-04 07:37:21 UTC (rev 48577)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-07-04 08:39:57 UTC (rev 48578)
@@ -1039,7 +1039,10 @@
 		if(WITH_OPENCOLORIO)
 			set(OPENCOLORIO ${LIBDIR}/opencolorio)
 			set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-			set(OPENCOLORIO_LIBRARIES OpenColorIO)
+			if(OCIO_STATIC_BUILD)
+				set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp) # for static 2 extra libs are needed
+			else()
+				set(OPENCOLORIO_LIBRARIES OpenColorIO)
 			set_lib_path(OPENCOLORIO_LIBPATH "opencolorio/lib")
 			set(OPENCOLORIO_DEFINITIONS)
 		endif()

Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2012-07-04 07:37:21 UTC (rev 48577)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2012-07-04 08:39:57 UTC (rev 48578)
@@ -280,7 +280,7 @@
 WITH_BF_OCIO = True
 BF_OCIO = LIBDIR + '/opencolorio'
 BF_OCIO_INC = BF_OCIO + '/include'
-BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp.a'
+BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp'
 BF_OCIO_LIBPATH = BF_OCIO + '/lib'
 
 WITH_BF_BOOST = True