[Cmake-commits] [cmake-commits] miguelf committed FindwxWidgets.cmake 1.27 1.28 UsewxWidgets.cmake 1.6 1.7

[cmake-commits at cmake.org]

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

Modified Files:
	FindwxWidgets.cmake UsewxWidgets.cmake 
Log Message:
BUG: Using PROPERTY COMPILE_DEFINITIONS_DEBUG to support Debug only preprocessor options (e.g., _DEBUG __WXDEBUG__).


Index: UsewxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UsewxWidgets.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** UsewxWidgets.cmake	4 Mar 2008 01:31:51 -0000	1.6
--- UsewxWidgets.cmake	24 Feb 2009 21:49:15 -0000	1.7
***************
*** 47,54 ****
  
    IF   (wxWidgets_DEFINITIONS)
!     ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} )
      MSG("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
    ENDIF(wxWidgets_DEFINITIONS)
  
    IF   (wxWidgets_CXX_FLAGS)
      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
--- 47,61 ----
  
    IF   (wxWidgets_DEFINITIONS)
!     SET_PROPERTY(DIRECTORY APPEND
!       PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS})
      MSG("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
    ENDIF(wxWidgets_DEFINITIONS)
  
+   IF   (wxWidgets_DEFINITIONS_DEBUG)
+     SET_PROPERTY(DIRECTORY APPEND
+       PROPERTY COMPILE_DEFINITIONS_DEBUG ${wxWidgets_DEFINITIONS_DEBUG})
+     MSG("wxWidgets_DEFINITIONS_DEBUG=${wxWidgets_DEFINITIONS_DEBUG}")
+   ENDIF(wxWidgets_DEFINITIONS_DEBUG)
+ 
    IF   (wxWidgets_CXX_FLAGS)
      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")

Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** FindwxWidgets.cmake	24 Dec 2008 09:31:33 -0000	1.27
--- FindwxWidgets.cmake	24 Feb 2009 21:49:15 -0000	1.28
***************
*** 42,46 ****
  #                               in WIN32 environment.
  #  wxWidgets_DEFINITIONS      - Contains defines required to compile/link
! #                               against WX, e.g. -DWXUSINGDLL
  #  wxWidgets_CXX_FLAGS        - Include dirs and ompiler flags for
  #                               unices, empty on WIN32. Esentially
--- 42,48 ----
  #                               in WIN32 environment.
  #  wxWidgets_DEFINITIONS      - Contains defines required to compile/link
! #                               against WX, e.g. WXUSINGDLL
! #  wxWidgets_DEFINITIONS_DEBUG- Contains defines required to compile/link
! #                               against WX debug builds, e.g. __WXDEBUG__
  #  wxWidgets_CXX_FLAGS        - Include dirs and ompiler flags for
  #                               unices, empty on WIN32. Esentially
***************
*** 414,418 ****
        wxWidgets-2.7.3
        wxWidgets-2.7.2
!       wxWidgest-2.7.1
        wxWidgets-2.7.0
        wxWidgets-2.7.0-1
--- 416,420 ----
        wxWidgets-2.7.3
        wxWidgets-2.7.2
!       wxWidgets-2.7.1
        wxWidgets-2.7.0
        wxWidgets-2.7.0-1
***************
*** 492,496 ****
        # If building shared libs, define WXUSINGDLL to use dllimport.
        IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
!         SET(wxWidgets_DEFINITIONS "-DWXUSINGDLL")
          DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
        ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
--- 494,498 ----
        # If building shared libs, define WXUSINGDLL to use dllimport.
        IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
!         SET(wxWidgets_DEFINITIONS WXUSINGDLL)
          DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
        ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
***************
*** 565,568 ****
--- 567,578 ----
          WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
  
+         # Add necessary definitions for unicode builds
+         IF("${UCD}" STREQUAL "u")
+           LIST(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
+         ENDIF("${UCD}" STREQUAL "u")
+ 
+         # Add necessary definitions for debug builds
+         SET(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
+ 
        ENDIF(WX_CONFIGURATION)
      ENDIF(WX_LIB_DIR)
***************
*** 693,701 ****
          DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
  
!         # parse definitions from cxxflags; drop -D* from CXXFLAGS
          STRING(REGEX MATCHALL "-D[^;]+"
            wxWidgets_DEFINITIONS  "${wxWidgets_CXX_FLAGS}")
          STRING(REGEX REPLACE "-D[^;]+;" ""
            wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
  
          # parse include dirs from cxxflags; drop -I prefix
--- 703,713 ----
          DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
  
!         # parse definitions from cxxflags; drop -D* from CXXFLAGS and the -D prefix
          STRING(REGEX MATCHALL "-D[^;]+"
            wxWidgets_DEFINITIONS  "${wxWidgets_CXX_FLAGS}")
          STRING(REGEX REPLACE "-D[^;]+;" ""
            wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+         STRING(REPLACE "-D" ""
+           wxWidgets_INCLUDE_DIRS "${wxWidgets_DEFINITIONS}")
  
          # parse include dirs from cxxflags; drop -I prefix