diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-30 14:41:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-30 14:41:47 (GMT) |
| commit | b1d072f5b01451042dcdf1cf469a0ed3af7dfb94 (patch) | |
| tree | c4dfff2bdb5e03c204635cd2dba3fc1f08725883 | |
| parent | 80bc73f1b823c7daf6eb5114792b2819a0d92c39 (diff) | |
| parent | cf78bf68120d52c5ccb0e024b922ce14a5f9e59a (diff) | |
| download | CMake-b1d072f5b01451042dcdf1cf469a0ed3af7dfb94.zip CMake-b1d072f5b01451042dcdf1cf469a0ed3af7dfb94.tar.gz CMake-b1d072f5b01451042dcdf1cf469a0ed3af7dfb94.tar.bz2 | |
Merge topic 'wxwidgets-windows-xp'
cf78bf68 FindwxWidgets: Add support for Windows XP compatible buils
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1193
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 63f2c60..be84999 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -527,8 +527,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") mswunivu/wx/setup.h mswunivud/wx/setup.h PATHS + ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}_xp${_WX_ARCH}_dll # prefer shared ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_dll # prefer shared ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_dll # prefer shared + ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}_xp${_WX_ARCH}_lib ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_lib ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_lib DOC "Path to wxWidgets libraries" @@ -546,8 +548,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") mswunivu/wx/setup.h mswunivud/wx/setup.h PATHS + ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}_xp${_WX_ARCH}_lib # prefer static ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_lib # prefer static ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_lib # prefer static + ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}_xp${_WX_ARCH}_dll ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_dll ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_dll DOC "Path to wxWidgets libraries" |