浏览代码

BUG: Added unicode paths for wxWidgets_LIB_DIR search and the 2.8.9 suffix for wxWidgets_ROOT_DIR search.

Miguel A. Figueroa-Villanueva 17 年之前
父节点
当前提交
a003ac39d3
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      Modules/FindwxWidgets.cmake

+ 3 - 2
Modules/FindwxWidgets.cmake

@@ -400,6 +400,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
       wxWidgets-2.9.2
       wxWidgets-2.9.1
       wxWidgets-2.9.0
+      wxWidgets-2.8.9
       wxWidgets-2.8.8
       wxWidgets-2.8.7
       wxWidgets-2.8.6
@@ -446,7 +447,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     ENDIF(MINGW)
     IF(BUILD_SHARED_LIBS)
       FIND_PATH(wxWidgets_LIB_DIR
-        NAMES msw/build.cfg mswd/build.cfg
+        NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg
         PATHS
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll   # prefer shared
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
@@ -455,7 +456,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         )
     ELSE(BUILD_SHARED_LIBS)
       FIND_PATH(wxWidgets_LIB_DIR
-        NAMES msw/build.cfg mswd/build.cfg
+        NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg
         PATHS
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib   # prefer static
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll