[Cmake-commits] [cmake-commits] miguelf committed FindwxWidgets.cmake 1.20 1.21

[cmake-commits at cmake.org]

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

Modified Files:
	FindwxWidgets.cmake 
Log Message:
BUG: Fix so that MinGW use win32_find_style (6478). Also, consolidated search styles selection into a single variable, so that they are mutually exclusive.



Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** FindwxWidgets.cmake	13 Jun 2008 20:33:29 -0000	1.20
--- FindwxWidgets.cmake	16 Jun 2008 18:15:52 -0000	1.21
***************
*** 175,193 ****
  #=====================================================================
  #=====================================================================
! IF(WIN32)
!   SET(WIN32_STYLE_FIND 1)
! ENDIF(WIN32)
! IF(MINGW)
!   SET(WIN32_STYLE_FIND 0)
!   SET(UNIX_STYLE_FIND 1)
! ENDIF(MINGW)
! IF(UNIX)
!   SET(UNIX_STYLE_FIND 1)
! ENDIF(UNIX)
  
  #=====================================================================
! # WIN32_STYLE_FIND
  #=====================================================================
! IF(WIN32_STYLE_FIND)
    # Useful common wx libs needed by almost all components.
    SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
--- 175,190 ----
  #=====================================================================
  #=====================================================================
! IF(WIN32 AND NOT CYGWIN)
!   SET(wxWidgets_FIND_STYLE "win32")
! ELSE(WIN32 AND NOT CYGWIN)
!   IF(UNIX)
!     SET(wxWidgets_FIND_STYLE "unix")
!   ENDIF(UNIX)
! ENDIF(WIN32 AND NOT CYGWIN)
  
  #=====================================================================
! # WIN32_FIND_STYLE
  #=====================================================================
! IF(wxWidgets_FIND_STYLE STREQUAL "win32")
    # Useful common wx libs needed by almost all components.
    SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
***************
*** 544,551 ****
  
  #=====================================================================
! # UNIX_STYLE_FIND
  #=====================================================================
! ELSE(WIN32_STYLE_FIND)
!   IF(UNIX_STYLE_FIND)
      #-----------------------------------------------------------------
      # UNIX: Helper MACROS
--- 541,548 ----
  
  #=====================================================================
! # UNIX_FIND_STYLE
  #=====================================================================
! ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
!   IF(wxWidgets_FIND_STYLE STREQUAL "unix")
      #-----------------------------------------------------------------
      # UNIX: Helper MACROS
***************
*** 730,745 ****
  
  #=====================================================================
! # Neither UNIX_STYLE_FIND, nor WIN32_STYLE_FIND
  #=====================================================================
!   ELSE(UNIX_STYLE_FIND)
      IF(NOT wxWidgets_FIND_QUIETLY)
        MESSAGE(STATUS
          "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
          "  Platform unknown/unsupported. It's neither WIN32 nor UNIX "
!         "style find."
          )
      ENDIF(NOT wxWidgets_FIND_QUIETLY)
!   ENDIF(UNIX_STYLE_FIND)
! ENDIF(WIN32_STYLE_FIND)
  
  # Debug output:
--- 727,742 ----
  
  #=====================================================================
! # Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
  #=====================================================================
!   ELSE(wxWidgets_FIND_STYLE STREQUAL "unix")
      IF(NOT wxWidgets_FIND_QUIETLY)
        MESSAGE(STATUS
          "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
          "  Platform unknown/unsupported. It's neither WIN32 nor UNIX "
!         "find style."
          )
      ENDIF(NOT wxWidgets_FIND_QUIETLY)
!   ENDIF(wxWidgets_FIND_STYLE STREQUAL "unix")
! ENDIF(wxWidgets_FIND_STYLE STREQUAL "win32")
  
  # Debug output: