Re: [cmake-developers] T-con/Meeting next week regarding CMake 2.8.4 planning

2010-12-06 Thread David Cole
On Sun, Dec 5, 2010 at 8:58 AM, Alexander Neundorf neund...@kde.org wrote:
 On Friday 03 December 2010, David Cole wrote:
 Hello CMake devs,

 If you're on the To line, then you have at least one bug assigned to
 you in the bug tracker that is slated to be addressed in the CMake
 2.8.4 release time frame ( according to
 http://public.kitware.com/Bug/roadmap_page.php ) I've cc'ed the rest
 of the CMake devs in case they are interested.

 #0008486 and #0007919 : Win CE, both assigned to me (because it's
 crosscompiling), but I can't do it.

 #0010176: IAR, mostly done, I need somebody who knows a bit cmake and has a
 windows machine to fix the last remaining issues (escaping whitespace in a
 path passed to the compiler AFAIK). The original reporters were not able to
 figure this out with my help.

 #0008392: preprocessing ASM files - it's on my TODO

 We at Kitware have a meeting scheduled for next Wed. Dec. 8th from
 10:00 am till 12:00 noon Eastern time USA. The purpose of the meeting

 That's a bit too early for me, I usually come home between 5 and 6, i.e. 11
 and 12 AM Eastern time.
 To make it easier for european spare-time contributors to take part, doing
 this between 2 to 4 PM eastern time would be better ? Would be 8 to 10 pm
 here.

 Alex



If we change it to 2 tp 4 pm Eastern, will you call in to the t-con line?

We could do that. It looks like our collective schedules will allow...
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [CMake] CPACK on windows

2010-12-06 Thread Otmane Lahlou

Hi,

I've got no answer for this,

Can someone tell me whether doing this with CMake is possible.

Thanks
Otmane


Otmane Lahlou a écrit :

Hi List,

When packaging my project, i want my project in the start menu to be 
organised

in several directories  :

In  the windows StartMenu i'd like to have something like that :

StartMenu - Programs - MyProject -   Directory1 - {My stuffs 1}
  
Directory2 - {My stuffs 2}
  
Uninstall


Here what i did : - I edit the variable CPACK_PACKAGE_EXECUTABLES with 
the executables name and their label :

   exe1  Description of exe1

- In case of Windows, i  used CPACK_NSIS_MENU_LINKS to have my 
shortcuts in the startmenu.
  Here is the point; i did not succed to use this macro to get the 
subdirectories organisation.

  but i have all the executables in the root directory MyProject :

 StartMenu - Programs - MyProject -   My stuffs 1
   My 
stuffs 2
   
Uninstall


Any hints to do that?
Thanks

Otmane
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html


Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ


Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake




___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] find_package with ###Config.cmake

2010-12-06 Thread Micha Renner
Andreas, Michael - thanks, you helped me lot.

Greetings
Micha


___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Wiki: version compatibility matrix

2010-12-06 Thread David Cole
Wow!

I wondered why all the responses here started with wow and then I
clicked through to see for myself this morning.

This is a *great* page. Phenomenally complete summary. Is it going to
be easy to add a column for CMake 2.8.4 after its release? Or is it
going to be painful?

Can you describe how much effort this took on your part? (Number of
hours esimate?)

Can you contribute your helper scripts to the CMake code base itself?
(Somewhere under CMake/Utilities perhaps...)


Thanks,
David Cole
Kitware, Inc.


On Mon, Dec 6, 2010 at 12:27 AM, Philip Lowman phi...@yhbt.com wrote:
 Wow.  Thank you for making this.  I think it will be a huge resource
 for CMake users.  Nothing is more annoying than having to track down
 when something was added, or not realizing that the behavior that you
 rely upon did not exist in a previous version.

 On Saturday, December 4, 2010, Johannes Zarl johannes.z...@jku.at wrote:
 Hello,

 The compatibility matrix for different versions of cmake is now complete and
 awaits review: http://www.cmake.org/Wiki/CMake_Version_Compatibility_Matrix

 Apart from factual errors and things I might have missed, I am also 
 interested
 if someone has a better idea for embedding the comments: they make the tables
 broader than they need to be. Also, the wiki warns that the page might be to
 big for some browsers. Should the page be divided into subpages?

 If no one objects, I will add a link to the main-page under Development
 Topics by Wednesday next week (2010-12-08).

 Cheers,
   Johannes
 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake


 --
 Philip Lowman
 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] CPACK on windows

2010-12-06 Thread David Cole
On Mon, Dec 6, 2010 at 3:37 AM, Otmane Lahlou otmane.lah...@c-s.fr wrote:
 Hi,

 I've got no answer for this,

 Can someone tell me whether doing this with CMake is possible.


Yes, it is possible. I do not have time to go into details and tell
you exactly how to do it, but if the built-in functionality provided
by CPACK_PACKAGE_EXECUTABLES and CPACK_NSIS_MENU_LINKS do not give you
sufficient control, you can always customize the NSIS input file that
CPack uses to tell NSIS how to build the installer.

See these threads that talk about customizing NSIS.template.in:
http://www.cmake.org/pipermail/cmake/2007-January/012649.html
http://www.cmake.org/pipermail/cmake/2010-July/037862.html
http://www.mail-archive.com/cmake@cmake.org/msg13128.html
http://www.mail-archive.com/cmake@cmake.org/msg28390.html

( All found by googling for customize cpack nsis template )


HTH,
David


 Thanks
 Otmane


 Otmane Lahlou a écrit :

 Hi List,

 When packaging my project, i want my project in the start menu to be
 organised
 in several directories  :

 In  the windows StartMenu i'd like to have something like that :

 StartMenu - Programs - MyProject -   Directory1 - {My stuffs 1}

  Directory2 - {My stuffs 2}
                                                                  Uninstall

 Here what i did : - I edit the variable CPACK_PACKAGE_EXECUTABLES with the
 executables name and their label :
   exe1  Description of exe1
    
 - In case of Windows, i  used CPACK_NSIS_MENU_LINKS to have my shortcuts
 in the startmenu.
  Here is the point; i did not succed to use this macro to get the
 subdirectories organisation.
  but i have all the executables in the root directory MyProject :

  StartMenu - Programs - MyProject -   My stuffs 1
                                                                   My
 stuffs 2

 Uninstall

 Any hints to do that?
 Thanks

 Otmane
 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake



 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Wiki: version compatibility matrix

2010-12-06 Thread Johannes Zarl

On 12/06/2010 at 12:33, David Cole david.c...@kitware.com wrote: 
 Wow!
 
 I wondered why all the responses here started with wow and then I
 clicked through to see for myself this morning.

Thank you all for your positive feedback, it is appreciated.

 This is a *great* page. Phenomenally complete summary. Is it going to
 be easy to add a column for CMake 2.8.4 after its release? Or is it
 going to be painful?

Wiki-wise it's easy to add another column, although time-consuming.
The best way to do this is to copy the wiki-code into a text-file
and then add a new column using a sensible text-editor.
You can use a regex to do this:
sed 's/^\(| [^|]*$\)/\1\n| style=background:green; | X/'

Afterwards, you would add new rows (this is less hassle, just copy an 
existing block) and adjust the values in each row.

 Can you describe how much effort this took on your part? (Number of
 hours estimate?)

I did it in my free time (obviously), so I didn't do any accounting.
I would estimate that it took about 8-12 hours (including breaks).

The time should scale pretty much linearly, so adding a new version
should take about an hour or so (depending on the number of changes).

 Can you contribute your helper scripts to the CMake code base itself?
 (Somewhere under CMake/Utilities perhaps...)

Sure, no problem. I don't have write-access to the code base, though.
I'll just send it to you, if that's ok...

  Johannes


-- 
Johannes Zarl
Virtual Reality Services

Johannes Kepler University
Informationsmanagement

Altenbergerstrasze 69
4040 Linz, Austria
Phone: +43 732 2468-8321
johannes.z...@jku.at
http://vrc.zid.jku.at










___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] providing library information, what's the cmake way

2010-12-06 Thread Kishore
On Sunday 05 Dec 2010 6:16:35 pm Michael Hertling wrote:
 On 11/30/2010 05:53 AM, Kishore wrote:
  On Tuesday 23 Nov 2010 5:27:56 pm Johannes Zarl wrote:
  Another somehow related topic seems to be import/export of targets. Should
  a LibraryConfig.cmake or FindLibrary.cmake file create imported targets
  for the library?
  
  Thanks for this thread. It has helped. However, i am still not clear about 
  the use of the export/import feature. I thought that libraries built with 
  cmake would not need to write their Find*.cmake or *Config.cmake modules as 
  they could simply use the EXPORT feature.
 
 No, the file created and installed by INSTALL(EXPORT ...) - casually
 denoted as a targets file - contains information about the targets
 provided by the package. The targets are set up as IMPORTED in the
 targets file, and the latter must be included by *Config.cmake which
 is still necessary. This is meant as a more flexible alternative to
 explicit paths in XXX_LIBRARIES variables, e.g.; with targets files,
 XXX_LIBRARIES contains the imported targets instead of the targets'
 paths, so the different build types can be handled much better at
 link time. The actual paths of the imported targets are specified
 by means of IMPORTED_LOCATION properties in the targets file, too.

Thanks Michael. I think i have this somewhat figured out now. Will use and see 
if i have more doubts.
-- 
Cheers!
Kishore
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Need some directions for non-trivial setup

2010-12-06 Thread Marcel Loose
Hi Klaim,

It's a bit clearer to me  now ;-)
Reading between the lines I get the feeling that you're probably better
off using just a single project anyway.
A developer doesn't need to continuously update the whole project when
working on his subproject. Building the whole thing once in his working
copy should suffice.

Personally, I have not yet gained any experience with
EXTERNAL_PROJECT(), so I cannot really help you there. If your
subsystems are *really* stand-alone pieces of software, then you should
create different CMake projects for them. However, like I said, I get
the feeling that that's not the case in your situation.

You might consider to use multiple PROJECT() commands inside your
source tree. It will make your life slightly easier when you later
decide you do want to split things up.

Hope this helps.
Marcel Loose.

 On 3-12-2010 at 13:13, in message
aanlktimfweyejp+maqkzcg-7a92bebvxhgo0bxrlj...@mail.gmail.com, Klaim
mjkl...@gmail.com wrote: 
 Thanks for pointing EXTERNAL_PROJECT , I've looked at it but can't
 understand how to get the path from outside.
 I'll try again see if I missed something about this feature and get
back to
 you.
 
 The projects are almost all independent and I need to allow working
with a
 clone of one subproject without retrieving everything, just it
dependencies.
 
 I'll try to be more clear :
  - there is a common language used to describe a Sequence (it's
not
 important so just understand that the important projects in the
framework
 will require this)
  - there are tools, all made to manipulate the sequences, so each
project is
 independant (separate repo) but some projects need to use other
projects, so
 we need to provide their path in their Cmake
  - there are players that are like tools but are just interpreter
projects -
 anyway they are as indpendant or dependant as tools
projects/subrepos
  - now I have central repository (default) that is just meant to
gather
 everything together; That's for people wanting everything but they
are few.
 Most subproject developers will just get their dependencies and work
from
 their, without updating the dependencies while developping. If you
get the
 default repo, you have synchronized repos togethere (read: we use
specific
 tags for each subrespo). So the default repository is mainly for the
 developers needing to touch everything. Like me.
 
 Is it more clear?
 
 On Fri, Dec 3, 2010 at 11:16, Marcel Loose lo...@astron.nl wrote:
 
  On 2-12-2010 at 16:12, in message
 

aanlktimju5wav=ekxnbmkplnl7dn_c+xssgkoefm5...@mail.gmail.comEKxnbmkpLnL7dN_c%
 2bxssgkoefm5...@mail.gmail.com,
 Klaim
 mjkl...@gmail.com wrote:
  Hi!
 
  I'm currently trying to understand how to use CMake for a
non-trivial
 setup
  of multiple-projects-framework. I'm a beginner at CMake (as
developer
 I
  mean, not as library user).
  I've read the docs and I tried to read the Ogre project CMake
 organization
  but it's a bit overkill for my project I think. Anyway, I'm lost
 here
  because
  I think I don't understand all I need to achieve what I want.
 
  My project is made of several sub projects that are all in
separate
  (mercurial) repositories.
  There is one default repository that use the mercurial subrepos
 feature to
  gather everything in one big framework project.
  You can see the repos there :
  http://code.google.com/p/art-of-sequence/source/browse/ (it's an
open
 source
  project but Idon't have the website ready yet to explain the
 concept)
 
  The Cmake organisation I want to setup I've already seen
somewhere
 else I
  think, but I'm a bit lost with all the ways to do it and I think
I'll
 make
  something very bad if I don't ask here for help here.
  I need each project (subrepo) to be available separately and can
be
 built
  giving to Cmake the paths of the project's dependencies.
  And I need the default repo to provide the paths.
 
  So I have this folder organisation in the default repo (that
gather
 all
  subrepos) :
 
  /language   # the intermediate language
(AOSL)
  definition project/subrepo
  /tools/# the folder that will contain
all
 the
  tools projects/subrepos
  /tools/aosdesigner   # a tool project/subrepo (in fact
the
 most
  important) - an executable
  /tools/aoslcpp # a tool project/subrepo that is a
 dependency
  of aosdesigner - a library (shared)
  /players/ # the folder that will contain
all
 the
  players (AOSL interpreters)
  /players/aoswebplayer # a player project/subrepo
 
  There will be additional tools and players projects, and I
think
 I'll
  need another folder for exporters but that's another subject.
 
  Here, what I'm trying to do, is to have a CMakeLists.txt for each
 project
  (but /language that is not source code but xsd, xml and text).
  Those projects will need the path of dependencies, like
 /tools/aosdesigner
  will require the path of /tools/aoslcpp.
 
  Then I want to set the paths of each 

Re: [CMake] Need some directions for non-trivial setup

2010-12-06 Thread Klaim


 It's a bit clearer to me  now ;-)
 Reading between the lines I get the feeling that you're probably better
 off using just a single project anyway.
 A developer doesn't need to continuously update the whole project when
 working on his subproject. Building the whole thing once in his working
 copy should suffice.

 Most of those projects (and future related projects) are not
interdependent. I had a repository with everything inside before (using
MSVC10 projects files) but it don't suit the developpement as each project
really need a separate repository with separate history and separate teams
working on it. I know I could use branches but that would make things harder
when managing the different projects separately.

They have to be separate. That's not a question to me anymore.


 Personally, I have not yet gained any experience with
 EXTERNAL_PROJECT(), so I cannot really help you there. If your
 subsystems are *really* stand-alone pieces of software, then you should
 create different CMake projects for them. However, like I said, I get
 the feeling that that's not the case in your situation.


It is this very case. I need them to be separate projects, sometime linked
because sometime you need some dependencies and maybe those dependencies are
in the same family of projects or something. Those dependencies might be
from outside too, but those projects have to be isolated.



 You might consider to use multiple PROJECT() commands inside your
 source tree. It will make your life slightly easier when you later
 decide you do want to split things up.


That's already what I do. Well that's what's i'm trying but until now I
can't find a way to say to CMake where are the other projects. I think I'm
misusing EXTERNAL_PROJECT() but I'm not sure how.
I'll get back on this issue in the week, see if I can make
EXTERNAL_PROJECT() work as I need. I really think I don't have all the
pieces of the puzzle. I'm reading the other thread about how to make
libraries works correctly with CMake and I think I don't know a lot about
what's really required.

Anyway, thanks for your help.


 On 3-12-2010 at 13:13, in message
 aanlktimfweyejp+maqkzcg-7a92bebvxhgo0bxrlj...@mail.gmail.comaanlktimfweyejp%2bmaqkzcg-7a92bebvxhgo0bxrlj...@mail.gmail.com,
 Klaim
 mjkl...@gmail.com wrote:
  Thanks for pointing EXTERNAL_PROJECT , I've looked at it but can't
  understand how to get the path from outside.
  I'll try again see if I missed something about this feature and get
 back to
  you.
 
  The projects are almost all independent and I need to allow working
 with a
  clone of one subproject without retrieving everything, just it
 dependencies.
 
  I'll try to be more clear :
   - there is a common language used to describe a Sequence (it's
 not
  important so just understand that the important projects in the
 framework
  will require this)
   - there are tools, all made to manipulate the sequences, so each
 project is
  independant (separate repo) but some projects need to use other
 projects, so
  we need to provide their path in their Cmake
   - there are players that are like tools but are just interpreter
 projects -
  anyway they are as indpendant or dependant as tools
 projects/subrepos
   - now I have central repository (default) that is just meant to
 gather
  everything together; That's for people wanting everything but they
 are few.
  Most subproject developers will just get their dependencies and work
 from
  their, without updating the dependencies while developping. If you
 get the
  default repo, you have synchronized repos togethere (read: we use
 specific
  tags for each subrespo). So the default repository is mainly for the
  developers needing to touch everything. Like me.
 
  Is it more clear?
 
  On Fri, Dec 3, 2010 at 11:16, Marcel Loose lo...@astron.nl wrote:
 
   On 2-12-2010 at 16:12, in message
 
 
 aanlktimju5wav=ekxnbmkplnl7dn_c+xssgkoefm5...@mail.gmail.comekxnbmkplnl7dn_c%2bxssgkoefm5...@mail.gmail.com
 EKxnbmkpLnL7dN_c%
  2bxssgkoefm5...@mail.gmail.com,
  Klaim
  mjkl...@gmail.com wrote:
   Hi!
  
   I'm currently trying to understand how to use CMake for a
 non-trivial
  setup
   of multiple-projects-framework. I'm a beginner at CMake (as
 developer
  I
   mean, not as library user).
   I've read the docs and I tried to read the Ogre project CMake
  organization
   but it's a bit overkill for my project I think. Anyway, I'm lost
  here
   because
   I think I don't understand all I need to achieve what I want.
  
   My project is made of several sub projects that are all in
 separate
   (mercurial) repositories.
   There is one default repository that use the mercurial subrepos
  feature to
   gather everything in one big framework project.
   You can see the repos there :
   http://code.google.com/p/art-of-sequence/source/browse/ (it's an
 open
  source
   project but Idon't have the website ready yet to explain the
  concept)
  
   The Cmake organisation I want to setup I've already seen
 somewhere
  

[CMake] BundleUtilities change to address change in behavior

2010-12-06 Thread David Cole
Clinton, (and anybody else reading who's interested / vested in the
BundleUtilities functionality),

Please review this change that I just pushed to 'next':
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2895f48a4e79af49937b9e6a260076440b1a67a

As a result of fixing these two bugs...
http://public.kitware.com/Bug/view.php?id=9744
http://public.kitware.com/Bug/view.php?id=10417

...we introduced a backwards-incompatible change to 'fixup_bundle' in
CMake 2.8.3. This affected ParaView and possibly other apps that
passed in libs to fixup_bundle and used to depend on the function to
copy the plugins into the bundle...

We are going to keep the new code anyway (and just fix up ParaView
--it's already been done, in fact). This new commit that I pushed
today is for making it easy to diagnose when somebody is depending on
the old behavior by making it an error to try to fixup something that
is not already inside the bundle. (Arguably we should have had this
error checking all along because it is, in fact, an error to attempt
to fixup some library that is not inside the bundle...)

Let me know if you have thoughts positive or negative on this.

Thanks,
David Cole
Kitware, Inc.
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[Cmake-commits] CMake branch, next, updated. v2.8.3-746-g8f51aff

2010-12-06 Thread Brad King
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.

The branch, next has been updated
   via  8f51affdab8d6d6df4c80cf782e0003bb26f8ee5 (commit)
   via  afc8906468bb09a934442bdbdcb86d9f40926e75 (commit)
   via  419e0d29a01bd2894f0214da4a27f2da24de8096 (commit)
   via  34ee41b9cca39cf6d22fa788c0df8bc56d92b33c (commit)
  from  46386b0ccd40f57c9eb4ad3f04f91f8b6080d0bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f51affdab8d6d6df4c80cf782e0003bb26f8ee5
commit 8f51affdab8d6d6df4c80cf782e0003bb26f8ee5
Merge: 46386b0 afc8906
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Dec 6 08:30:28 2010 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Dec 6 08:30:28 2010 -0500

Merge branch 'master' into next


---

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits


[Cmake-commits] CMake branch, next, updated. v2.8.3-748-g36f1176

2010-12-06 Thread David Cole
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.

The branch, next has been updated
   via  36f117641d689e8c2a19308d6a0ade7b9aaa5eae (commit)
   via  a2a997d8c479e2b0a56354ef107239f550117c44 (commit)
  from  8f51affdab8d6d6df4c80cf782e0003bb26f8ee5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36f117641d689e8c2a19308d6a0ade7b9aaa5eae
commit 36f117641d689e8c2a19308d6a0ade7b9aaa5eae
Merge: 8f51aff a2a997d
Author: David Cole david.c...@kitware.com
AuthorDate: Mon Dec 6 08:58:32 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 6 08:58:32 2010 -0500

Merge topic 'fix-typo-in-error-message' into next

a2a997d Correct misspelling in error message text.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2a997d8c479e2b0a56354ef107239f550117c44
commit a2a997d8c479e2b0a56354ef107239f550117c44
Author: David Cole david.c...@kitware.com
AuthorDate: Mon Dec 6 08:44:26 2010 -0500
Commit: David Cole david.c...@kitware.com
CommitDate: Mon Dec 6 08:44:26 2010 -0500

Correct misspelling in error message text.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 2baacbf..c8374db 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -341,7 +341,7 @@ bool cmCacheManager::LoadCache(const char* path,
 std::string(The current CMakeCache.txt directory ) +
 currentcwd + std::string( is different than the directory ) +
 std::string(this-GetCacheValue(CMAKE_CACHEFILE_DIR)) +
-std::string( where CMackeCache.txt was created. This may result 
+std::string( where CMakeCache.txt was created. This may result 
 in binaries being created in the wrong place. If you 
 are not sure, reedit the CMakeCache.txt);
   cmSystemTools::Error(message.c_str());

---

Summary of changes:
 Source/cmCacheManager.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits