Find correct library for MSVC vs MingW in Winows

EleutherAI · Jul 21, 2011 · 9fa4b72 · 9fa4b72
1 parent 3e78b29
commit 9fa4b72
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
@@ -20,8 +20,15 @@ FIND_PROGRAM(GETTEXT_MSGFMT
 # they do not because gettext is part of glibc
 # TODO check the requirements on other BSDs and older Linux
 IF (WIN32)
+ IF(MSVC)
+ SET(GETTEXT_LIB_NAMES
+ libintl.lib intl.lib libintl3.lib intl3.lib)
+ ELSE()
+ SET(GETTEXT_LIB_NAMES
+ libintl.dll.a intl.dll.a libintl3.dll.a intl3.dll.a)
+ ENDIF()
  FIND_LIBRARY(GETTEXT_LIBRARY
- NAMES libintl.lib intl.lib libintl3.lib intl3.lib
+ NAMES ${GETTEXT_LIB_NAMES}
  PATHS "${CUSTOM_GETTEXT_PATH}/lib"
  DOC "gettext *intl*.lib")
  FIND_LIBRARY(GETTEXT_DLL

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -235,10 +235,6 @@ else()
  set(ARCH i386)
  endif()
 
- if(WIN32 AND USE_GETTEXT)
- set(CMAKE_EXE_LINKER_FLAGS "-l${GETTEXT_LIBRARY}")
- endif()
-
  set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
  set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")