Fwd: KDE/kdelibs/cmake/modules

[Peter Kuemmel]

--- Peter Kümmel <syntheticpp at yahoo.com> wrote:

> From: Peter Kümmel <syntheticpp at yahoo.com>
> To: kde-commits at kde.org
> Subject: KDE/kdelibs/cmake/modules
> Date: Fri, 03 Nov 2006 22:26:27 +0000
> 
> SVN commit 601625 by kuemmel:
> 
> update with the QTMAIN part of the cmake cvs
> 
>  M  +13 -3     FindQt4.cmake  
> 
> 
> --- trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake #601624:601625
> @@ -586,10 +586,17 @@
>    # Set QT_QTDESIGNER_LIBRARY
>    FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 PATHS
> ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
>  
> - # Set QT_QTDESIGNER_LIBRARY
> +  # Set QT_QTDESIGNER_LIBRARY
>    FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents
> QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
>  
> -
> +  # Set QT_QTMAIN_LIBRARY
> +  IF(WIN32)
> +    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS
> ${QT_LIBRARY_DIR}
> +      NO_DEFAULT_PATH)
> +    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS
> ${QT_LIBRARY_DIR}
> +      NO_DEFAULT_PATH)
> +  ENDIF(WIN32)
> +  
>    ############################################
>    #
>    # Check the existence of the libraries.
> @@ -631,7 +638,10 @@
>    ENDMACRO (_QT4_ADJUST_LIB_VARS)
>  
>    IF(WIN32)
> -     _QT4_ADJUST_LIB_VARS(QTMAIN)
> +    # there is no include for qtmain but adjust macro needs it set
> +    SET(QT_QTMAIN_INCLUDE_DIR 1)
> +    _QT4_ADJUST_LIB_VARS(QTMAIN)
> +    SET(QT_QTMAIN_INCLUDE_DIR )
>    ENDIF(WIN32)
>  
>  
> 



 
____________________________________________________________________________________
Want to start your own business? Learn how on Yahoo! Small Business 
(http://smallbusiness.yahoo.com)