Commit d7af8a34 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'findwxwidgets-msys-library-dirs'

44ad8e48

 FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1930
parents 57c2834d 44ad8e48
Pipeline #97757 passed with stage
in 0 seconds
......@@ -863,6 +863,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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment