From f4a0ac93e349c1501204691e8318e9f7366fb786 Mon Sep 17 00:00:00 2001
From: Deamhan <workmailpk@gmail.com>
Date: Mon, 15 Jul 2019 19:13:58 +0300
Subject: [PATCH] CMake: wxUSE_VISIBILITY is non windows option now &
 -Wl,--exclude-libs=ALL has been added in MinGW case.

---
 build/cmake/init.cmake    | 8 +-------
 build/cmake/options.cmake | 4 +++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 6bb9ffcaf1..ca1c2b17eb 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -44,13 +44,7 @@ if(MSVC)
 elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
     if(wxBUILD_USE_STATIC_RUNTIME)
         if(MINGW)
-            set(STATIC_LINKER_FLAGS " -static")
-            set(EXCLUDED_LIBS gcc_eh
-                              pthread
-            )
-            foreach(lib ${EXCLUDED_LIBS})
-                wx_string_append(STATIC_LINKER_FLAGS " -Wl,--exclude-libs=lib${lib}.a")
-            endforeach()
+            set(STATIC_LINKER_FLAGS " -static -Wl,--exclude-libs=ALL")
         else()
             set(STATIC_LINKER_FLAGS " -static-libgcc -static-libstdc++")
         endif()
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 35a3858ccc..452f65ddf6 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -59,7 +59,9 @@ if(NOT WIN32)
 endif()
 
 wx_option(wxUSE_COMPILER_TLS "enable use of compiler TLS support")
-wx_option(wxUSE_VISIBILITY "use of ELF symbols visibility")
+if(NOT WIN32)
+    wx_option(wxUSE_VISIBILITY "use of ELF symbols visibility")
+endif()
 wx_option(wxUSE_UNSAFE_WXSTRING_CONV "provide unsafe implicit conversions in wxString to const char* or std::string")
 wx_option(wxUSE_REPRODUCIBLE_BUILD "enable reproducable build" OFF)