diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2010-01-17 22:19:15 +0300 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2010-01-17 22:19:15 +0300 |
| commit | 42baabba5da44505bbd94a845a96bb1c6fe18eda (patch) | |
| tree | 08a0f3e5fac8c70d6855c995b5ef1698e4b04765 /CMake | |
| parent | 50b35842d9d4645f8fcab9800539117070c2343a (diff) | |
Fix link libraries for Win32 Cmake debug build. Unfortunately, debug builds are still crashing at startup - need to investigate further.
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 258cbdf57b6..1e8fe391918 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -135,15 +135,35 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) ENDIF(WITH_QUICKTIME) IF(WITH_OPENEXR) - TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) + IF(WIN32) + FOREACH(loop_var ${OPENEXR_LIB}) + TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) + ENDFOREACH(loop_var) + ELSEIF(WIN32) + TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) + ENDIF(WIN32) ENDIF(WITH_OPENEXR) IF(WITH_FFMPEG) TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB}) ENDIF(WITH_FFMPEG) IF(WITH_OPENCOLLADA) - TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB}) - TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB}) - TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB}) + IF(WIN32) + FOREACH(loop_var ${OPENCOLLADA_LIB}) + TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) + ENDFOREACH(loop_var) + TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB}) + IF(EXPAT_LIB) + TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB}) + ENDIF(EXPAT_LIB) + ELSE(WIN32) + TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB}) + TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB}) + TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB}) + ENDIF(WIN32) ENDIF(WITH_OPENCOLLADA) IF(WIN32) TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB}) |