diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-11-15 16:36:25 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-11-15 16:36:25 +0300 |
| commit | 3da0ee287caa023ef827a22ff92109ea0f859754 (patch) | |
| tree | 7ecf205963e9df9a9bd520693c4f6d518e5f0444 /CMakeLists.txt | |
| parent | 9ce972521124f73c86ad6cbf5c37ff3c5f01b7f7 (diff) | |
cmake / windows cleanup
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c8b40ff0620..7b2e5b95663 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1310,23 +1310,13 @@ elseif(WIN32) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include) set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR) set(OPENEXR_LIBPATH ${OPENEXR}/lib) - if(MSVC12) - set(OPENEXR_LIBRARIES - ${OPENEXR_LIBPATH}/Iex-2_1.lib - ${OPENEXR_LIBPATH}/Half.lib - ${OPENEXR_LIBPATH}/IlmImf-2_1.lib - ${OPENEXR_LIBPATH}/Imath-2_1.lib - ${OPENEXR_LIBPATH}/IlmThread-2_1.lib - ) - else() - set(OPENEXR_LIBRARIES - ${OPENEXR_LIBPATH}/Iex.lib - ${OPENEXR_LIBPATH}/Half.lib - ${OPENEXR_LIBPATH}/IlmImf.lib - ${OPENEXR_LIBPATH}/Imath.lib - ${OPENEXR_LIBPATH}/IlmThread.lib - ) - endif() + set(OPENEXR_LIBRARIES + ${OPENEXR_LIBPATH}/Iex-2_1.lib + ${OPENEXR_LIBPATH}/Half.lib + ${OPENEXR_LIBPATH}/IlmImf-2_1.lib + ${OPENEXR_LIBPATH}/Imath-2_1.lib + ${OPENEXR_LIBPATH}/IlmThread-2_1.lib + ) endif(NOT OPENEXR_FOUND) endif() @@ -1423,6 +1413,7 @@ elseif(WIN32) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib) set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0") set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD") + add_definitions(-DOIIO_STATIC_BUILD) endif() if(WITH_LLVM) @@ -1977,7 +1968,6 @@ elseif(APPLE) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO}/lib/libOpenImageIO.a ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES}) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH}) set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD") - add_definitions(-DOIIO_STATIC_BUILD) endif() if(WITH_OPENCOLORIO) |