Commit: b3faabae2f55626adbe6b8f38eeb87bc16925b73
Author: Jason Wilkins
Date: Sun Aug 3 11:35:39 2014 -0500
Branches: master
https://developer.blender.org/rBb3faabae2f55626adbe6b8f38eeb87bc16925b73
Fixed linking OIIO on Windows. The debug and optimized options need to be
before each individual library in a list.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebe5eae..d8194c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1291,9 +1291,9 @@ elseif(WIN32)
find_package(OpenImageIO)
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
- set(OIIO_OPTIMIZED OpenImageIO OpenImageIO_Util)
- set(OIIO_DEBUG OpenImageIO_d OpenImageIO_Util_d)
- set(OPENIMAGEIO_LIBRARIES optimized ${OIIO_OPTIMIZED}
debug ${OIIO_DEBUG})
+ set(OIIO_OPTIMIZED optimized OpenImageIO optimized
OpenImageIO_Util)
+ set(OIIO_DEBUG debug OpenImageIO_d debug
OpenImageIO_Util_d)
+ set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED}
${OIIO_DEBUG})
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
