Merge remote-tracking branch 'origin/master'

10 years ago · 0cd0717e13
parent f3d3cbc58b 23bfa29ae6
commit 0cd0717e13
1 changed files with 4 additions and 1 deletions
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -201,7 +201,10 @@ if (GIT_CHECKOUT)
 endif (GIT_CHECKOUT)

 if (WIN32)
-target_link_libraries(components shlwapi)
+    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