diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-08-03 20:35:39 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-08-03 20:35:39 +0400 |
| commit | b3faabae2f55626adbe6b8f38eeb87bc16925b73 (patch) | |
| tree | 3e365eb5027e0e42e7f148998aefd7ebbe5911e8 /CMakeLists.txt | |
| parent | 02b66f8a55096ffa9631cfdcf1f53add12841c7f (diff) | |
Fixed linking OIIO on Windows. The debug and optimized options need to be before each individual library in a list.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ebe5eaee280..d8194c6a9c4 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() |