[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-167-gfd8d380

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fd8d38038c72efac13f7fbf040669697890c3a94 (commit)
       via  bf643286d32b569d20e7b7431ecc8755443fe5c4 (commit)
      from  99ae7c1b7e2338a18f054c927cbc64ed4b25e1a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd8d38038c72efac13f7fbf040669697890c3a94
commit fd8d38038c72efac13f7fbf040669697890c3a94
Merge: 99ae7c1 bf64328
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 17 08:53:48 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 17 08:53:48 2016 -0500

    Merge topic 'FindwxWidgets-msys2-paths' into next
    
    bf643286 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf643286d32b569d20e7b7431ecc8755443fe5c4
commit bf643286d32b569d20e7b7431ecc8755443fe5c4
Author:     Wayne Stambaugh <stambaughw at verizon.net>
AuthorDate: Sun Feb 14 20:51:11 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 17 08:52:56 2016 -0500

    FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths
    
    We use `sh wx-config` to launch the `wx-config` tool so that it can run
    even on Windows.  Since it is always a shell script its output may use
    POSIX paths even on Windows.  Use `cygpath` to convert to Windows paths.

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 49ce57e..8c07e6c 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -835,6 +835,36 @@ else()
       endif()
     endif()
 
+    # When using wx-config in MSYS, the include paths are UNIX style paths which may or may
+    # not work correctly depending on you MSYS/MinGW configuration.  CMake expects native
+    # paths internally.
+    if(wxWidgets_FOUND AND MSYS)
+      find_program(_cygpath_exe cygpath ONLY_CMAKE_FIND_ROOT_PATH)
+      DBG_MSG_V("_cygpath_exe:  ${_cygpath_exe}")
+      if(_cygpath_exe)
+        set(_tmp_path "")
+        foreach(_path ${wxWidgets_INCLUDE_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}")
+            set(_tmp_path "${_tmp_path} ${_native_path}")
+          endif()
+        endforeach()
+        DBG_MSG("Setting wxWidgets_INCLUDE_DIRS = ${_tmp_path}")
+        set(wxWidgets_INCLUDE_DIRS ${_tmp_path})
+        separate_arguments(wxWidgets_INCLUDE_DIRS)
+        list(REMOVE_ITEM wxWidgets_INCLUDE_DIRS "")
+      endif()
+      unset(_cygpath_exe CACHE)
+    endif()
+
 #=====================================================================
 # Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
 #=====================================================================

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake