Fix mingw Windows build

5 years ago · d6e4fbe085
parent 2618974ad6
commit d6e4fbe085
2 changed files with 4 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -304,7 +304,10 @@ endif()

 set(BOOST_COMPONENTS system filesystem program_options iostreams)
 if(WIN32)
-    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale zlib)
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
+    if(MSVC)
+        set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
+    endif(MSVC)
 endif(WIN32)

 IF(BOOST_STATIC)
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -267,9 +267,6 @@ endif (GIT_CHECKOUT)

 if (WIN32)
    target_link_libraries(components shlwapi)
-    if(MINGW)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOGDI")
-    endif(MINGW)
 endif()

 # Fix for not visible pthreads functions for linker with glibc 2.15