KDE/kdelibs/cmake/modules

Alexander Neundorf neundorf at kde.org
Mon Jul 26 21:17:28 CEST 2010


On Monday 12 July 2010, Andreas Holzammer wrote:
> SVN commit 1149092 by aholzammer:
>
> - fixed some find scripts for wince
>
>  M  +6 -0      FindKDE4Internal.cmake
>  M  +2 -2      KDE4Macros.cmake

Hi Andreas,

it's very nice that you are working on Win CE support for KDE and that you are 
contributing these efforts.

Anyhow, there are some issues.

We have a commit policy for kdelibs/cmake/modules/:
http://techbase.kde.org/Policies/CMake_Commit_Policy

While not explicitely mentioned on that page, adding support for a new OS fits 
under section 2 "Patches which refactor multiple modules at once or 
which...", so you really should have posted these patches for discussion 
first to kde-buildsystem.

Are these the changes in use by the KDAB devs ?

The major issue I have with these patches is that it adds support for WINCE to 
KDE, while no official cmake version actually supports WINCE.

So, in the current state, your changes will not go into 4.4.x or 4.5, since 
they rely on stuff which is not and may never be present in cmake.

Before that can happen, cmake must have support for WINCE in its master or 
next branch (or in a released version).
The relevant entry in the cmake issue tracker is this one: 
http://public.kitware.com/Bug/view.php?id=7919

Since I don't have any Windows machine at hand, I cannot really continue the 
work there, Brad or somebody else has to do this.
So please try hard to get the patches attached on this page committed to 
cmake.
I think the stopper is currently comment 0016984 from Brad.

Alex


>
>
> --- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #1149091:1149092
> @@ -508,6 +508,7 @@
>
>     set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
>
> +
>     # when building kdelibs, make the kcfg rules depend on the binaries...
>     set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
>     set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen)
> @@ -577,8 +578,13 @@
>     get_target_property(_importedConfigurations 
> ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS ) list(GET
> _importedConfigurations 0 _firstConfig)
>
> +   if(NOT WINCE)
>     get_target_property(KDE4_KCFGC_EXECUTABLE            
> ${KDE4_TARGET_PREFIX}kconfig_compiler    LOCATION_${_firstConfig})
> get_target_property(KDE4_MEINPROC_EXECUTABLE         
> ${KDE4_TARGET_PREFIX}meinproc4           LOCATION_${_firstConfig}) +  
> else(NOT WINCE)
> +    set(KDE4_KCFGC_EXECUTABLE            
> ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) +   
> set(KDE4_MEINPROC_EXECUTABLE         
> ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 ) +   endif(NOT WINCE)
>     get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE 
> ${KDE4_TARGET_PREFIX}kauth-policy-gen    LOCATION_${_firstConfig})
> get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE   
> ${KDE4_TARGET_PREFIX}makekdewidgets      LOCATION_${_firstConfig})
>
> --- trunk/KDE/kdelibs/cmake/modules/KDE4Macros.cmake #1149091:1149092
> @@ -1094,7 +1094,7 @@
>  macro (KDE4_ADD_WIN32_APP_ICON appsources)
>      message(STATUS "KDE4_ADD_WIN32_APP_ICON() is deprecated, use
> KDE4_ADD_APP_ICON() instead") if (WIN32)
> -        find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
> +        find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR}
> NO_DEFAULT_PATH ) find_program(WINDRES_EXECUTABLE NAMES windres)
>          if(MSVC)
>              set(WINDRES_EXECUTABLE TRUE)
> @@ -1126,7 +1126,7 @@
>      set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
>
>      if (WIN32)
> -        find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
> +        find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR}
> NO_DEFAULT_PATH ) find_program(WINDRES_EXECUTABLE NAMES windres)
>          if(MSVC)
>              set(WINDRES_EXECUTABLE TRUE)




More information about the Kde-buildsystem mailing list