[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48580] branches/soc-2011-tomato/ CMakeLists.txt: revert last cmake change and do it in __APPLE__ block only

[jens verwiebe]

Revision: 48580
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48580
Author:   jensverwiebe
Date:     2012-07-04 08:51:30 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
revert last cmake change and do it in __APPLE__ block only

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt     2012-07-04 08:41:01 UTC (rev 
48579)
+++ branches/soc-2011-tomato/CMakeLists.txt     2012-07-04 08:51:30 UTC (rev 
48580)
@@ -1039,11 +1039,7 @@
                if(WITH_OPENCOLORIO)
                        set(OPENCOLORIO ${LIBDIR}/opencolorio)
                        set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-                       if(OCIO_STATIC_BUILD)
-                               set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml 
yaml-cpp) # for static 2 extra libs are needed
-                       else()
-                               set(OPENCOLORIO_LIBRARIES OpenColorIO)
-                       endif()
+                       set(OPENCOLORIO_LIBRARIES OpenColorIO)
                        set_lib_path(OPENCOLORIO_LIBPATH "opencolorio/lib")
                        set(OPENCOLORIO_DEFINITIONS)
                endif()
@@ -1474,7 +1470,7 @@
        if(WITH_OPENCOLORIO)
                set(OPENCOLORIO ${LIBDIR}/opencolorio)
                set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-               set(OPENCOLORIO_LIBRARIES OpenColorIO)
+               set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
                set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
                set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
        endif()

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs