diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindODBC.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindODBC.cmake b/Modules/FindODBC.cmake index 29d7af9..3f710db 100644 --- a/Modules/FindODBC.cmake +++ b/Modules/FindODBC.cmake @@ -92,6 +92,8 @@ if(WIN32) # List names of ODBC libraries on Windows if(NOT MINGW) set(ODBC_LIBRARY odbc32.lib) + else() + set(ODBC_LIBRARY libodbc32.a) endif() set(_odbc_lib_names odbc32;) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 12c68bb..4334e22 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -517,6 +517,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") find_path(wxWidgets_LIB_DIR NAMES qtu/wx/setup.h + qtud/wx/setup.h msw/wx/setup.h mswd/wx/setup.h mswu/wx/setup.h @@ -543,6 +544,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") find_path(wxWidgets_LIB_DIR NAMES qtu/wx/setup.h + qtud/wx/setup.h msw/wx/setup.h mswd/wx/setup.h mswu/wx/setup.h @@ -647,7 +649,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # Find wxWidgets libraries. WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}") if(WX_USE_REL_AND_DBG) - WX_FIND_LIBS("${UNV}" "${UCD}" "d") + WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d") endif() # Settings for requested libs (i.e., include dir, libraries, etc.). |