[Cmake-commits] [cmake-commits] miguelf committed FindwxWidgets.cmake 1.25 1.26

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv782

Modified Files:
	FindwxWidgets.cmake 
Log Message:
BUG: Fix to find wxWidgets_LIB_DIR for windows platform more generally;
     supports gcc, nmake, and visual studio in all configurations.



Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** FindwxWidgets.cmake	20 Oct 2008 01:14:55 -0000	1.25
--- FindwxWidgets.cmake	20 Oct 2008 15:50:04 -0000	1.26
***************
*** 448,452 ****
      IF(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg
          PATHS
          ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll   # prefer shared
--- 448,460 ----
      IF(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         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
***************
*** 457,461 ****
      ELSE(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg
          PATHS
          ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib   # prefer static
--- 465,477 ----
      ELSE(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         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