mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-10 15:50:50 -06:00
FindwxWidgets: Move wx-config specific checks inside UNIX find-style
This commit is contained in:
@@ -948,29 +948,29 @@ if(wxWidgets_FIND_STYLE STREQUAL "unix")
|
||||
endif()
|
||||
unset(_cygpath_exe CACHE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Check that all libraries are present, as wx-config does not check it
|
||||
set(_wx_lib_missing "")
|
||||
foreach(_wx_lib_ ${wxWidgets_LIBRARIES})
|
||||
if("${_wx_lib_}" MATCHES "^-l(.*)")
|
||||
set(_wx_lib_name "${CMAKE_MATCH_1}")
|
||||
unset(_wx_lib_found CACHE)
|
||||
find_library(_wx_lib_found NAMES ${_wx_lib_name} HINTS ${wxWidgets_LIBRARY_DIRS})
|
||||
if(_wx_lib_found STREQUAL _wx_lib_found-NOTFOUND)
|
||||
list(APPEND _wx_lib_missing ${_wx_lib_name})
|
||||
# Check that all libraries are present, as wx-config does not check it
|
||||
set(_wx_lib_missing "")
|
||||
foreach(_wx_lib_ ${wxWidgets_LIBRARIES})
|
||||
if("${_wx_lib_}" MATCHES "^-l(.*)")
|
||||
set(_wx_lib_name "${CMAKE_MATCH_1}")
|
||||
unset(_wx_lib_found CACHE)
|
||||
find_library(_wx_lib_found NAMES ${_wx_lib_name} HINTS ${wxWidgets_LIBRARY_DIRS})
|
||||
if(_wx_lib_found STREQUAL _wx_lib_found-NOTFOUND)
|
||||
list(APPEND _wx_lib_missing ${_wx_lib_name})
|
||||
endif()
|
||||
unset(_wx_lib_found CACHE)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if (_wx_lib_missing)
|
||||
string(REPLACE ";" " " _wx_lib_missing "${_wx_lib_missing}")
|
||||
DBG_MSG_V("wxWidgets not found due to following missing libraries: ${_wx_lib_missing}")
|
||||
set(wxWidgets_FOUND FALSE)
|
||||
unset(wxWidgets_LIBRARIES)
|
||||
endif()
|
||||
unset(_wx_lib_found CACHE)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if (_wx_lib_missing)
|
||||
string(REPLACE ";" " " _wx_lib_missing "${_wx_lib_missing}")
|
||||
DBG_MSG_V("wxWidgets not found due to following missing libraries: ${_wx_lib_missing}")
|
||||
set(wxWidgets_FOUND FALSE)
|
||||
unset(wxWidgets_LIBRARIES)
|
||||
unset(_wx_lib_missing)
|
||||
endif()
|
||||
unset(_wx_lib_missing)
|
||||
|
||||
# Check if a specific version was requested by find_package().
|
||||
if(wxWidgets_FOUND)
|
||||
|
||||
Reference in New Issue
Block a user