sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Boost directories were not properly configured to vc2010.

Browse Source 
Opencolorio directories and openimageio not work as you would expect macro
This commit is contained in:
Alexander Pinzon 2012-09-25 15:11:34 +00:00
parent 80fed19ffc
commit c0a7773ccf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1073,7 +1073,7 @@ elseif(WIN32)
set(BOOST ${LIBDIR}/boost) set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include) set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC10) 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_POSTFIX "vc100-mt-s-1_49.lib")
set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib") set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else() else()
@ -1109,7 +1109,7 @@ elseif(WIN32)
set(OPENCOLORIO ${LIBDIR}/opencolorio) set(OPENCOLORIO ${LIBDIR}/opencolorio)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
set(OPENCOLORIO_LIBRARIES OpenColorIO) set(OPENCOLORIO_LIBRARIES OpenColorIO)
set_lib_path(OPENCOLORIO_LIBPATH "opencolorio/lib") set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
set(OPENCOLORIO_DEFINITIONS) set(OPENCOLORIO_DEFINITIONS)
endif() endif()

4
source/creator/CMakeLists.txt
View File

@ -636,7 +636,7 @@ elseif(WIN32)
if(WITH_OPENIMAGEIO) if(WITH_OPENIMAGEIO)
if(NOT MINGW) if(NOT MINGW)
set_lib_path(OIIOBIN "openimageio") set(OIIOBIN ${LIBDIR}/openimageio)
install( install(
FILES FILES
${OIIOBIN}/bin/OpenImageIO.dll ${OIIOBIN}/bin/OpenImageIO.dll
@ -646,7 +646,7 @@ elseif(WIN32)
endif() endif()
if(WITH_OPENCOLORIO) if(WITH_OPENCOLORIO)
set_lib_path(OCIOBIN "opencolorio/bin") set(OCIOBIN ${LIBDIR}/opencolorio/bin)
if(NOT MINGW) if(NOT MINGW)
install( install(
FILES FILES