BUG: Fixed placement of initial wxWidgets_FOUND=TRUE statement, which allowed
some cases to breakaway from tests without resetting to FALSE (BUG: 8188).
This commit is contained in:
parent
df2321f774
commit
1e5d400100
|
@ -489,8 +489,6 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
|
||||||
ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
|
ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
|
||||||
|
|
||||||
IF(WX_LIB_DIR)
|
IF(WX_LIB_DIR)
|
||||||
SET(wxWidgets_FOUND TRUE)
|
|
||||||
|
|
||||||
# If building shared libs, define WXUSINGDLL to use dllimport.
|
# If building shared libs, define WXUSINGDLL to use dllimport.
|
||||||
IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
|
IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
|
||||||
SET(wxWidgets_DEFINITIONS "-DWXUSINGDLL")
|
SET(wxWidgets_DEFINITIONS "-DWXUSINGDLL")
|
||||||
|
@ -509,6 +507,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
|
||||||
DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
|
DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
|
||||||
|
|
||||||
IF(WX_CONFIGURATION)
|
IF(WX_CONFIGURATION)
|
||||||
|
SET(wxWidgets_FOUND TRUE)
|
||||||
|
|
||||||
# If the selected configuration wasn't found force the default
|
# If the selected configuration wasn't found force the default
|
||||||
# one. Otherwise, use it but still force a refresh for
|
# one. Otherwise, use it but still force a refresh for
|
||||||
# updating the doc string with the current list of available
|
# updating the doc string with the current list of available
|
||||||
|
|
Loading…
Reference in New Issue