kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Miguel A. Figueroa-Villanueva 2008-10-19 21:14:55 -04:00
parent e12f299f9d
commit a003ac39d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindwxWidgets.cmake
View File

@ -400,6 +400,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
wxWidgets-2.9.2 wxWidgets-2.9.2
wxWidgets-2.9.1 wxWidgets-2.9.1
wxWidgets-2.9.0 wxWidgets-2.9.0
wxWidgets-2.8.9
wxWidgets-2.8.8 wxWidgets-2.8.8
wxWidgets-2.8.7 wxWidgets-2.8.7
wxWidgets-2.8.6 wxWidgets-2.8.6
@ -446,7 +447,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
ENDIF(MINGW) ENDIF(MINGW)
IF(BUILD_SHARED_LIBS) IF(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR 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 PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
@ -455,7 +456,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
) )
ELSE(BUILD_SHARED_LIBS) ELSE(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR 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 PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll