Commit 51e3d894 authored by Brian Sidebotham's avatar Brian Sidebotham

* Fix FindwxWidgets.cmake for V3.0 wxWidgets using 'win32' style find. i.e....

* Fix FindwxWidgets.cmake for V3.0 wxWidgets using 'win32' style find. i.e. for MinGW native build without msys or cygwin
parent edc57834
...@@ -274,6 +274,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -274,6 +274,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets multilib base libraries. # Find wxWidgets multilib base libraries.
FIND_LIBRARY(WX_base${_DBG} FIND_LIBRARY(WX_base${_DBG}
NAMES NAMES
wxbase30${_UCD}${_DBG}
wxbase29${_UCD}${_DBG} wxbase29${_UCD}${_DBG}
wxbase28${_UCD}${_DBG} wxbase28${_UCD}${_DBG}
wxbase27${_UCD}${_DBG} wxbase27${_UCD}${_DBG}
...@@ -286,6 +287,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -286,6 +287,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
FOREACH(LIB net odbc xml) FOREACH(LIB net odbc xml)
FIND_LIBRARY(WX_${LIB}${_DBG} FIND_LIBRARY(WX_${LIB}${_DBG}
NAMES NAMES
wxbase30${_UCD}${_DBG}_${LIB}
wxbase29${_UCD}${_DBG}_${LIB} wxbase29${_UCD}${_DBG}_${LIB}
wxbase28${_UCD}${_DBG}_${LIB} wxbase28${_UCD}${_DBG}_${LIB}
wxbase27${_UCD}${_DBG}_${LIB} wxbase27${_UCD}${_DBG}_${LIB}
...@@ -300,6 +302,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -300,6 +302,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets monolithic library. # Find wxWidgets monolithic library.
FIND_LIBRARY(WX_mono${_DBG} FIND_LIBRARY(WX_mono${_DBG}
NAMES NAMES
wxmsw${_UNV}30${_UCD}${_DBG}
wxmsw${_UNV}29${_UCD}${_DBG} wxmsw${_UNV}29${_UCD}${_DBG}
wxmsw${_UNV}28${_UCD}${_DBG} wxmsw${_UNV}28${_UCD}${_DBG}
wxmsw${_UNV}27${_UCD}${_DBG} wxmsw${_UNV}27${_UCD}${_DBG}
...@@ -315,6 +318,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -315,6 +318,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
stc ribbon propgrid) stc ribbon propgrid)
FIND_LIBRARY(WX_${LIB}${_DBG} FIND_LIBRARY(WX_${LIB}${_DBG}
NAMES NAMES
wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}27${_UCD}${_DBG}_${LIB} wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
...@@ -428,6 +432,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -428,6 +432,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
D:/ D:/
$ENV{ProgramFiles} $ENV{ProgramFiles}
PATH_SUFFIXES PATH_SUFFIXES
wxWidgets-3.0.0
wxWidgets-2.9.5
wxWidgets-2.9.4 wxWidgets-2.9.4
wxWidgets-2.9.3 wxWidgets-2.9.3
wxWidgets-2.9.2 wxWidgets-2.9.2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment