Browse Source

Merge topic 'patch-1'

b69d64f72b FindwxWidgets: special case -latomic

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10377
Brad King 10 months ago
parent
commit
6da08ab967
1 changed files with 4 additions and 0 deletions
  1. 4 0
      Modules/FindwxWidgets.cmake

+ 4 - 0
Modules/FindwxWidgets.cmake

@@ -963,6 +963,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "unix")
     foreach(_wx_lib_ ${wxWidgets_LIBRARIES})
     foreach(_wx_lib_ ${wxWidgets_LIBRARIES})
       if("${_wx_lib_}" MATCHES "^-l(.*)")
       if("${_wx_lib_}" MATCHES "^-l(.*)")
         set(_wx_lib_name "${CMAKE_MATCH_1}")
         set(_wx_lib_name "${CMAKE_MATCH_1}")
+        if(_wx_lib_name STREQUAL "atomic")
+          continue()
+        endif()
+
         unset(_wx_lib_found CACHE)
         unset(_wx_lib_found CACHE)
         find_library(_wx_lib_found NAMES ${_wx_lib_name} HINTS ${wxWidgets_LIBRARY_DIRS})
         find_library(_wx_lib_found NAMES ${_wx_lib_name} HINTS ${wxWidgets_LIBRARY_DIRS})
         if(_wx_lib_found STREQUAL _wx_lib_found-NOTFOUND)
         if(_wx_lib_found STREQUAL _wx_lib_found-NOTFOUND)