win32 was using iconv even when international was disabled.
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Oct 2009 03:09:17 +0000 (03:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Oct 2009 03:09:17 +0000 (03:09 +0000)
CMake/macros.cmake

index e8f378c09251982d043a3a816368fbcdc90eedf1..150bd55bfd7e06a2f10ef5d3cc8d62c526d4739b 100644 (file)
@@ -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)