mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS

Browse Source 
The check for `wxWidgets_LIBRARIES` variable, introduced by e8b77084, fails
with the `wx-config` script generated by an MSYS build, because
`wxWidgets_LIBRARY_DIRS` is in POSIX style.

This commit fixes the problem with `wxWidgets_LIBRARY_DIRS` by converting it to
Windows style.  The actual code were copied from bf643286, which does the same
thing for `wxWidgets_INCLUDE_DIRS`.
This commit is contained in:
ARATA Mizuki
2018-04-05 01:01:21 +09:00
parent 3201e4c156
commit 44ad8e48de
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/FindwxWidgets.cmake
View File

@@ -875,6 +875,26 @@ else()
set(wxWidgets_INCLUDE_DIRS ${_tmp_path})
separate_arguments(wxWidgets_INCLUDE_DIRS)
list(REMOVE_ITEM wxWidgets_INCLUDE_DIRS "")
set(_tmp_path "")
foreach(_path ${wxWidgets_LIBRARY_DIRS})
execute_process(
COMMAND cygpath -w ${_path}
OUTPUT_VARIABLE _native_path
RESULT_VARIABLE _retv
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
if(_retv EQUAL 0)
file(TO_CMAKE_PATH ${_native_path} _native_path)
DBG_MSG_V("Path ${_path} converted to ${_native_path}")
string(APPEND _tmp_path " ${_native_path}")
endif()
endforeach()
DBG_MSG("Setting wxWidgets_LIBRARY_DIRS = ${_tmp_path}")
set(wxWidgets_LIBRARY_DIRS ${_tmp_path})
separate_arguments(wxWidgets_LIBRARY_DIRS)
list(REMOVE_ITEM wxWidgets_LIBRARY_DIRS "")
endif()
unset(_cygpath_exe CACHE)
endif()