KDE/kdelibs/cmake/modules

[Alexander Neundorf]

On Thursday 03 January 2008, Luboš Luňák wrote:
> SVN commit 756696 by lunakl:
>
> Consistent naming for xf86misc - include and flag are xf86misc, lib is
> Xxf86misc.

I'm not sure this change is good:

This is a source incompatible change.
Somebody may use these variables and now they don't exist anymore, so his 
build may fail.
We are at the day of the tagging, IMO too late for such changes.

It makes our FindX11.cmake incompatible to the one in CMake, which makes it 
harder for us to use the CMake version, since it requires more changes once 
we do that (after merging differences etc.).

Did you intentionally leave the name X11_Xxf86misc_LIB as it is ?

I feel like reverting this patch both for 4.1 and 4.0 would be the best thing 
to do. Since I don't know in which other places you had to commit changes to 
use these new names I don't feel like doing that myself.

Alex


>  M  +9 -9      FindX11.cmake
>
>
> --- trunk/KDE/kdelibs/cmake/modules/FindX11.cmake #756695:756696
> @@ -17,8 +17,8 @@
>  #                X11_dpms_INCLUDE_PATH,         (in X11_Xext_LIB), 
> X11_dpms_FOUND #                X11_XShm_INCLUDE_PATH,         (in
> X11_Xext_LIB),  X11_XShm_FOUND #                X11_Xshape_INCLUDE_PATH,   
>    (in X11_Xext_LIB),  X11_Xshape_FOUND -#               
> X11_Xf86misc_INCLUDE_PATH,     X11_Xxf86misc_LIB,  X11_Xf86misc_FOUND -#   
>             X11_xf86vmode_INCLUDE_PATH,                       
> X11_Xf86vmode_FOUND +#                X11_xf86misc_INCLUDE_PATH,    
> X11_Xxf86misc_LIB,  X11_xf86misc_FOUND +#               
> X11_xf86vmode_INCLUDE_PATH,                        X11_xf86vmode_FOUND #   
>             X11_Xfixes_INCLUDE_PATH,       X11_Xfixes_LIB,    
> X11_Xfixes_FOUND #                X11_Xft_INCLUDE_PATH,         
> X11_Xft_LIB,        X11_Xft_FOUND #               
> X11_Xinerama_INCLUDE_PATH,     X11_Xinerama_LIB,   X11_Xinerama_FOUND @@
> -80,7 +80,7 @@
>    FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h       
> ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h       
>                ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_dpms_INCLUDE_PATH
> X11/extensions/dpms.h              ${X11_INC_SEARCH_PATH}) - 
> FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h     
> ${X11_INC_SEARCH_PATH}) +  FIND_PATH(X11_xf86misc_INCLUDE_PATH
> X11/extensions/xf86misc.h      ${X11_INC_SEARCH_PATH})
> FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h   
> ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xfixes_INCLUDE_PATH
> X11/extensions/Xfixes.h          ${X11_INC_SEARCH_PATH})
> FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h                      
> ${X11_INC_SEARCH_PATH}) @@ -236,10 +236,10 @@
>       SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH})
>    ENDIF (X11_Xrandr_INCLUDE_PATH AND X11_Xrandr_LIB)
>
> -  IF (X11_Xxf86misc_INCLUDE_PATH AND X11_Xxf86misc_LIB)
> -     SET(X11_Xxf86misc_FOUND TRUE)
> -     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH})
> -  ENDIF (X11_Xxf86misc_INCLUDE_PATH  AND X11_Xxf86misc_LIB)
> +  IF (X11_xf86misc_INCLUDE_PATH AND X11_Xxf86misc_LIB)
> +     SET(X11_xf86misc_FOUND TRUE)
> +     SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86misc_INCLUDE_PATH})
> +  ENDIF (X11_xf86misc_INCLUDE_PATH  AND X11_Xxf86misc_LIB)
>
>    IF (X11_xf86vmode_INCLUDE_PATH)
>       SET(X11_xf86vmode_FOUND TRUE)
> @@ -399,7 +399,7 @@
>      X11_Xrender_LIB
>      X11_Xrender_INCLUDE_PATH
>      X11_Xxf86misc_LIB
> -    X11_Xxf86misc_INCLUDE_PATH
> +    X11_xf86misc_INCLUDE_PATH
>      X11_xf86vmode_INCLUDE_PATH
>      X11_Xinerama_LIB
>      X11_Xinerama_INCLUDE_PATH
> @@ -415,7 +415,7 @@
>      X11_Xaccessrules_INCLUDE_PATH
>      X11_Xaccessstr_INCLUDE_PATH
>      X11_Xdmcp_INCLUDE_PATH
> -    X11_Xf86misc_INCLUDE_PATH
> +    X11_xf86misc_INCLUDE_PATH
>      X11_Xkb_INCLUDE_PATH
>      X11_Xkblib_INCLUDE_PATH
>      X11_Xkbfile_INCLUDE_PATH