From b84cdafbb5e927407aec138dd96adb8fe556cbb3 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 24 Apr 2012 09:58:03 +0000 Subject: [PATCH] Add cycles support for MinGW-w64 --- CMakeLists.txt | 4 ++-- source/creator/CMakeLists.txt | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72bdb898ced..e949859772b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -373,8 +373,8 @@ if(MINGW) "line if youre a developer who wants to add support.") endif() - if((WITH_MINGW64) AND (WITH_CYCLES OR WITH_OPENCOLLADA OR WITH_LIBMV OR WITH_CODEC_FFMPEG)) - message(FATAL_ERROR "MINGW64 still doesn't support: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_OPENCOLLADA/WITH_LIBMV/WITH_CODEC_FFMPEG") + if((WITH_MINGW64) AND (WITH_OPENCOLLADA OR WITH_LIBMV OR WITH_CODEC_FFMPEG)) + message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_LIBMV/WITH_CODEC_FFMPEG") endif() endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 3e1b7772d17..0168c06b7da 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -599,12 +599,14 @@ elseif(WIN32) ) if(WITH_OPENIMAGEIO) - set_lib_path(OIIOBIN "openimageio/bin") - install( - FILES - ${OIIOBIN}/OpenImageIO.dll - DESTINATION ${TARGETDIR} - ) + if(NOT MINGW) + set_lib_path(OIIOBIN "openimageio/bin") + install( + FILES + ${OIIOBIN}/OpenImageIO.dll + DESTINATION ${TARGETDIR} + ) + endif() endif() elseif(APPLE)