Merged changes in the trunk up to revision 46045.
[blender-staging.git] / source / creator / CMakeLists.txt
index afa056ee4bc2c400a2cbf24677aa4a0f9bbe4d14..9618725dfad19c48614d1108bb759778052de47c 100644 (file)
@@ -449,7 +449,7 @@ elseif(WIN32)
                DESTINATION ${TARGETDIR}
        )
 
-       if(WITH_INTERNATIONAL)
+       if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
                install(
                        FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
                        DESTINATION ${TARGETDIR}
@@ -524,11 +524,14 @@ elseif(WIN32)
                        DESTINATION ${TARGETDIR}
                )
        else()
-               install(
-                       FILES
-                               ${LIBDIR}/zlib/lib/zlib.dll
-                       DESTINATION ${TARGETDIR}
-               )
+               #not needed since we link statically, maybe also unneeded for MinGW?
+               if(NOT WITH_MINGW64)
+                       install(
+                               FILES
+                                       ${LIBDIR}/zlib/lib/zlib.dll
+                               DESTINATION ${TARGETDIR}
+                       )
+               endif()
        endif()
 
        if(MSVC)
@@ -537,10 +540,13 @@ elseif(WIN32)
                        DESTINATION ${TARGETDIR}
                )
        else()
-               install(
-                       FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
-                       DESTINATION ${TARGETDIR}
-               )
+               #MinGW64 comes with own version. For portable builds it will probaly have to be copied to work
+               if(NOT WITH_MINGW64)
+                       install(
+                               FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
+                               DESTINATION ${TARGETDIR}
+                       )
+               endif()
        endif()
 
        if(WITH_CODEC_FFMPEG)
@@ -594,12 +600,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)