[Cmake-commits] [cmake-commits] miguelf committed FindwxWidgets.cmake 1.23 1.24

[cmake-commits at cmake.org]

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

Modified Files:
	FindwxWidgets.cmake 
Log Message:
ENH: Improved support for finding wxWidgets in MinGW environment.


Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** FindwxWidgets.cmake	6 Jul 2008 08:57:40 -0000	1.23
--- FindwxWidgets.cmake	13 Jul 2008 22:06:22 -0000	1.24
***************
*** 396,399 ****
--- 396,404 ----
        $ENV{ProgramFiles}
      PATH_SUFFIXES 
+       wxWidgets-2.9.4
+       wxWidgets-2.9.3
+       wxWidgets-2.9.2
+       wxWidgets-2.9.1
+       wxWidgets-2.9.0
        wxWidgets-2.8.8
        wxWidgets-2.8.7
***************
*** 411,414 ****
--- 416,420 ----
        wxWidgets-2.7.0
        wxWidgets-2.7.0-1
+       wxWidgets-2.6.4
        wxWidgets-2.6.3
        wxWidgets-2.6.2
***************
*** 434,443 ****
      # Prefer static/shared order usually consistent with build
      # settings.
      IF(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         NAMES wxpng.lib wxpngd.lib
          PATHS
!         ${WX_ROOT_DIR}/lib/vc_dll   # prefer shared
!         ${WX_ROOT_DIR}/lib/vc_lib
          DOC "Path to wxWidgets libraries?"
          NO_DEFAULT_PATH
--- 440,454 ----
      # Prefer static/shared order usually consistent with build
      # settings.
+     IF(MINGW)
+       SET(WX_LIB_DIR_PREFIX gcc)
+     ELSE(MINGW)
+       SET(WX_LIB_DIR_PREFIX vc)
+     ENDIF(MINGW)
      IF(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         NAMES msw/build.cfg mswd/build.cfg
          PATHS
!         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll   # prefer shared
!         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
          DOC "Path to wxWidgets libraries?"
          NO_DEFAULT_PATH
***************
*** 445,452 ****
      ELSE(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         NAMES wxpng.lib wxpngd.lib
          PATHS
!         ${WX_ROOT_DIR}/lib/vc_lib   # prefer static
!         ${WX_ROOT_DIR}/lib/vc_dll
          DOC "Path to wxWidgets libraries?"
          NO_DEFAULT_PATH
--- 456,463 ----
      ELSE(BUILD_SHARED_LIBS)
        FIND_PATH(wxWidgets_LIB_DIR
!         NAMES msw/build.cfg mswd/build.cfg
          PATHS
!         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib   # prefer static
!         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll
          DOC "Path to wxWidgets libraries?"
          NO_DEFAULT_PATH