summaryrefslogtreecommitdiffstats
path: root/Modules/FindwxWidgets.cmake
diff options
context:
space:
mode:
authorMiguel A. Figueroa-Villanueva <miguelf@ieee.org>2008-10-20 01:14:55 (GMT)
committerMiguel A. Figueroa-Villanueva <miguelf@ieee.org>2008-10-20 01:14:55 (GMT)
commita003ac39d3bc0a48d8f4221ce752250928816d32 (patch)
tree42fb50b926bc779434429a56c0129b7313a79768 /Modules/FindwxWidgets.cmake
parente12f299f9d04f166640532345c1dec89610e575c (diff)
downloadCMake-a003ac39d3bc0a48d8f4221ce752250928816d32.zip
CMake-a003ac39d3bc0a48d8f4221ce752250928816d32.tar.gz
CMake-a003ac39d3bc0a48d8f4221ce752250928816d32.tar.bz2
BUG: Added unicode paths for wxWidgets_LIB_DIR search and the 2.8.9 suffix for wxWidgets_ROOT_DIR search.
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
-rw-r--r--Modules/FindwxWidgets.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index ec82b52..0905704 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/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