Merge pull request #579 from AdrianDC/mingw

CMakeLists: Avoid MSVC iconv changes for MinGW builds
doxygen · Jul 8, 2017 · daa2c09 · daa2c09
2 parents e30e944 + 9532e0f
commit daa2c09
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,12 +48,14 @@ if (${CMAKE_SYSTEM} MATCHES "Darwin")
 endif()
 
 if (WIN32)
-    if(NOT ICONV_DIR)
-      set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
+    if (NOT "${CMAKE_GENERATOR}" MATCHES ".*MinGW Makefiles.*")
+        if (NOT ICONV_DIR)
+          set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
+        endif()
+        set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit
+        add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS)
     endif()
-    set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit
-    add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
 if ("${CMAKE_GENERATOR}" MATCHES "Ninja")