Revision: 41705
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41705
Author: psy-fi
Date: 2011-11-09 18:50:48 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
Fixes for MinGW cmake debug build:
* OpenEXR doesn't need debug suffix
* Fix libmv template issue when linking by removing duplicate libmv inclusion.
I wonder how this never turned up in release builds as well.
Important: Since OpenImageIO went into trunk, OpenEXR, possibly along with
other image libraries will need to be turned on too because OIIO depends on
them.
Modified Paths:
--------------
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-11-09 17:22:55 UTC
(rev 41704)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-11-09 18:50:48 UTC
(rev 41705)
@@ -272,7 +272,7 @@
target_link_libraries(${target} ${BOOST_LIBRARIES})
endif()
if(WITH_IMAGE_OPENEXR)
- if(WIN32 AND NOT UNIX)
+ if(WIN32 AND NOT UNIX AND NOT CMAKE_COMPILER_IS_GNUCC)
file_list_suffix(OPENEXR_LIBRARIES_DEBUG
"${OPENEXR_LIBRARIES}" "_d")
target_link_libraries_debug(${target}
"${OPENEXR_LIBRARIES_DEBUG}")
target_link_libraries_optimized(${target}
"${OPENEXR_LIBRARIES}")
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-11-09 17:22:55 UTC (rev
41704)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-11-09 18:50:48 UTC (rev
41705)
@@ -841,7 +841,6 @@
extern_minilzo
extern_lzma
extern_colamd
- extern_libmv
ge_logic_ketsji
extern_recastnavigation
ge_phys_common
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
