From a9ef985b320363890a96c755bea4966d413ef9f1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Oct 2009 03:09:17 +0000 Subject: [PATCH] win32 was using iconv even when international was disabled. --- CMake/macros.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMake/macros.cmake b/CMake/macros.cmake index e8f378c0925..150bd55bfd7 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -105,7 +105,12 @@ MACRO(SETUP_LIBLINKS IF(WITH_INTERNATIONAL) TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) + + IF(WIN32) + TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) + ENDIF(WIN32) ENDIF(WITH_INTERNATIONAL) + IF(WITH_OPENAL) TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY}) ENDIF(WITH_OPENAL) @@ -121,9 +126,6 @@ MACRO(SETUP_LIBLINKS IF(WITH_SDL) TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY}) ENDIF(WITH_SDL) - IF(WIN32) - TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) - ENDIF(WIN32) IF(WITH_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) ENDIF(WITH_QUICKTIME)