[Tux4kids-tuxtype-dev] [Tuxmath-devel] t4k_common problem in tuxtype and tuxmath

[sasayins]

The ConfigureChecksIntl.cmake is needed for cmake build. I checked
Johndhel's submission which is the tarball file then I found
the ConfigureChecksIntl.cmake file. I think the ConfigureChecksIntl.cmake is
not autogenerated file because that file existed in the tuxmath
cmake-modules directory. I checked again the latest revision both in
automake and cmake and its working fine.

kiko




On Thu, Dec 23, 2010 at 1:32 AM, David Bruce <davidstuartbruce at gmail.com>wrote:

> Hi,
>
> I got a different error when trying to pull from git:
>
> dbruce at debian-laptop:/usr/local/src/git/t4kcommon$ git pull
> Password:
> Updating 03000a0..860950b
> error: Untracked working tree file
> 'cmake-modules/ConfigureChecksIntl.cmake' would be overwritten by
> merge.  Aborting
>
> By deleting that file locally, I was then able to pull.  So is this a
> generated file?  If so, we shouldn't be tracking it in git.
>
> Anyway, after that, the build and install itself didn't have any problems.
>
> David
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/tux4kids-tuxtype-dev/attachments/20101223/67c6d810/attachment.htm>