diff options
author | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2008-12-24 09:31:33 (GMT) |
---|---|---|
committer | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2008-12-24 09:31:33 (GMT) |
commit | 1e5d400100dc724e22a78c2d0ca034bc38718c13 (patch) | |
tree | 9294941ba605fab83990c108a1ddfb536fee0454 /Modules/FindwxWidgets.cmake | |
parent | df2321f77491ff17994549b1baf6849a9abb49a7 (diff) | |
download | CMake-1e5d400100dc724e22a78c2d0ca034bc38718c13.zip CMake-1e5d400100dc724e22a78c2d0ca034bc38718c13.tar.gz CMake-1e5d400100dc724e22a78c2d0ca034bc38718c13.tar.bz2 |
BUG: Fixed placement of initial wxWidgets_FOUND=TRUE statement, which allowed
some cases to breakaway from tests without resetting to FALSE (BUG: 8188).
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
-rw-r--r-- | Modules/FindwxWidgets.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index c01e6a7..11df1b5 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -489,8 +489,6 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR) IF(WX_LIB_DIR) - SET(wxWidgets_FOUND TRUE) - # If building shared libs, define WXUSINGDLL to use dllimport. IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*") SET(wxWidgets_DEFINITIONS "-DWXUSINGDLL") @@ -509,6 +507,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") IF(WX_CONFIGURATION) + SET(wxWidgets_FOUND TRUE) + # If the selected configuration wasn't found force the default # one. Otherwise, use it but still force a refresh for # updating the doc string with the current list of available |