Boost directories were not properly configured to vc2010.
authorAlexander Pinzon <apinzonf@gmail.com>
Tue, 25 Sep 2012 15:11:34 +0000 (15:11 +0000)
committerAlexander Pinzon <apinzonf@gmail.com>
Tue, 25 Sep 2012 15:11:34 +0000 (15:11 +0000)
Opencolorio directories and openimageio not work as you would expect macro

CMakeLists.txt
source/creator/CMakeLists.txt

index 6fc84a4..b39390c 100644 (file)
@@ -1073,7 +1073,7 @@ elseif(WIN32)
                        set(BOOST ${LIBDIR}/boost)
                        set(BOOST_INCLUDE_DIR ${BOOST}/include)
                        if(MSVC10)
-                               set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
+                               set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
                                set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
                                set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
                        else()
@@ -1109,7 +1109,7 @@ elseif(WIN32)
                        set(OPENCOLORIO ${LIBDIR}/opencolorio)
                        set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
                        set(OPENCOLORIO_LIBRARIES OpenColorIO)
-                       set_lib_path(OPENCOLORIO_LIBPATH "opencolorio/lib")
+                       set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
                        set(OPENCOLORIO_DEFINITIONS)
                endif()
 
index 0068bb9..1880957 100644 (file)
@@ -636,7 +636,7 @@ elseif(WIN32)
 
        if(WITH_OPENIMAGEIO)
                if(NOT MINGW)
-                       set_lib_path(OIIOBIN "openimageio")
+                       set(OIIOBIN ${LIBDIR}/openimageio)
                        install(
                                FILES
                                        ${OIIOBIN}/bin/OpenImageIO.dll
@@ -646,7 +646,7 @@ elseif(WIN32)
        endif()
 
        if(WITH_OPENCOLORIO)
-               set_lib_path(OCIOBIN "opencolorio/bin")
+               set(OCIOBIN ${LIBDIR}/opencolorio/bin)
                if(NOT MINGW)
                        install(
                                FILES