fix staic OCIO with cmake and a little correction in scons)
authorJens Verwiebe <info@jensverwiebe.de>
Wed, 4 Jul 2012 08:39:57 +0000 (08:39 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Wed, 4 Jul 2012 08:39:57 +0000 (08:39 +0000)
CMakeLists.txt
build_files/scons/config/darwin-config.py

index 094bec5df9e3c2cc7a1243e3b290a3c75199630b..d533cfeb21fdfca991344258a6fd575f7844fa1c 100644 (file)
@@ -1470,7 +1470,7 @@ elseif(APPLE)
        if(WITH_OPENCOLORIO)
                set(OPENCOLORIO ${LIBDIR}/opencolorio)
                set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
        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()
                set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
                set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
        endif()
index 44c4ee24d5e7c1ada5342e253a7ab9b196827f7e..4ffc0aaf6f523828c76240f90fc4c8ef5db4c859 100644 (file)
@@ -280,7 +280,7 @@ BF_OIIO_LIBPATH = BF_OIIO + '/lib'
 WITH_BF_OCIO = True
 BF_OCIO = LIBDIR + '/opencolorio'
 BF_OCIO_INC = BF_OCIO + '/include'
 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
 BF_OCIO_LIBPATH = BF_OCIO + '/lib'
 
 WITH_BF_BOOST = True