kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix to find wxWidgets_LIB_DIR for windows platform more generally;

Browse Source 
supports gcc, nmake, and visual studio in all configurations.
This commit is contained in:
Miguel A. Figueroa-Villanueva 2008-10-20 11:50:04 -04:00
parent 6405e77098
commit 0325639f30
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/FindwxWidgets.cmake
View File

@ -447,7 +447,15 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
ENDIF(MINGW) ENDIF(MINGW)
IF(BUILD_SHARED_LIBS) IF(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR 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 PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
@ -456,7 +464,15 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
) )
ELSE(BUILD_SHARED_LIBS) ELSE(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR 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 PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll