Solve restriction of MinGW that users have to turn ffmpeg on for cmake.
authorAntony Riakiotakis <kalast@gmail.com>
Sun, 22 Apr 2012 14:33:40 +0000 (14:33 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Sun, 22 Apr 2012 14:33:40 +0000 (14:33 +0000)
CMakeLists.txt
build_files/cmake/macros.cmake

index 003176e7b96a5770cbe47be02609dff593cc6d3d..a0935917c8a205332b865c01bc639800c654ce83 100644 (file)
@@ -370,11 +370,6 @@ if(MINGW)
                                    "because it is currently unsupported, remove this "
                                    "line if youre a developer who wants to add support.")
        endif()
-
-       if((NOT WITH_CODEC_FFMPEG) AND (WITH_CYCLES OR WITH_IMAGE_OPENEXR OR WITH_IMAGE_TIFF))
-               message(FATAL_ERROR "MINGW has a problem with: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_IMAGE_TIFF "
-                                   "when WITH_CODEC_FFMPEG is disabled, enable FFMPEG or disable CYCLES/EXR/TIFF.")
-       endif()
 endif()
 
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
index 406f2537dce748b622f243394cf99f24f20f35a8..eeefcf730c85812e66cbe2d58ebbe867a732f834 100644 (file)
@@ -212,11 +212,9 @@ macro(setup_liblinks
        target_link_libraries(${target}
                        ${OPENGL_gl_LIBRARY}
                        ${OPENGL_glu_LIBRARY}
-                       ${JPEG_LIBRARIES}
                        ${PNG_LIBRARIES}
                        ${ZLIB_LIBRARIES}
-                       ${FREETYPE_LIBRARY}
-                       ${PLATFORM_LINKLIBS})
+                       ${FREETYPE_LIBRARY})
 
        # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
        if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
@@ -271,6 +269,7 @@ macro(setup_liblinks
        if(WITH_BOOST)
                target_link_libraries(${target} ${BOOST_LIBRARIES})
        endif()
+       target_link_libraries(${target} ${JPEG_LIBRARIES})
        if(WITH_IMAGE_OPENEXR)
                if(WIN32 AND NOT UNIX AND NOT CMAKE_COMPILER_IS_GNUCC)
                        file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
@@ -328,6 +327,8 @@ macro(setup_liblinks
        if(WIN32 AND NOT UNIX)
                target_link_libraries(${target} ${PTHREADS_LIBRARIES})
        endif()
+
+       target_link_libraries(${target} ${PLATFORM_LINKLIBS})
 endmacro()
 
 macro(TEST_SSE_SUPPORT
@@ -677,4 +678,4 @@ macro(set_lib_path
        endif()
 
 
-endmacro()
\ No newline at end of file
+endmacro()