diff options
| author | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2008-10-20 15:50:04 (GMT) |
|---|---|---|
| committer | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2008-10-20 15:50:04 (GMT) |
| commit | 0325639f302741bd3ae282401549fc586b48c357 (patch) | |
| tree | 8f9d7ab11ee947a874aa8684ef57f4ac5633d68f /Modules/FindwxWidgets.cmake | |
| parent | 6405e77098d30bb5460e3110a8398b6ada508e80 (diff) | |
| download | CMake-0325639f302741bd3ae282401549fc586b48c357.zip CMake-0325639f302741bd3ae282401549fc586b48c357.tar.gz CMake-0325639f302741bd3ae282401549fc586b48c357.tar.bz2 | |
BUG: Fix to find wxWidgets_LIB_DIR for windows platform more generally;
supports gcc, nmake, and visual studio in all configurations.
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 0905704..c01e6a7 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -447,7 +447,15 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ENDIF(MINGW) IF(BUILD_SHARED_LIBS) FIND_PATH(wxWidgets_LIB_DIR - NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg + NAMES + msw/wx/setup.h + mswd/wx/setup.h + mswu/wx/setup.h + mswud/wx/setup.h + mswuniv/wx/setup.h + mswunivd/wx/setup.h + mswunivu/wx/setup.h + mswunivud/wx/setup.h PATHS ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib @@ -456,7 +464,15 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ) ELSE(BUILD_SHARED_LIBS) FIND_PATH(wxWidgets_LIB_DIR - NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg + NAMES + msw/wx/setup.h + mswd/wx/setup.h + mswu/wx/setup.h + mswud/wx/setup.h + mswuniv/wx/setup.h + mswunivd/wx/setup.h + mswunivu/wx/setup.h + mswunivud/wx/setup.h PATHS ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll |