[cmake-developers] I'm sure this is often asked

2011-07-29 Thread J Decker
Any reason that environment variables can't be used as cmake
variables?  Like of course any cmake variable in a script would
override the environment, but if it's not otherwise found, checking in
the environemnt would make scripts prettier.


set BUILD_TYPE=debug
set BUILD_MONOLITHIC=1
cmake /path/to/source

instead of having to pass -DBUILD_TYPE=debug -DBUILD_MONOLITHIC which
gets strung out all on one line usually.  some longer varaibles might
be -DSACK_INTERSHELL_SDK_ROOT_PATH=$SACK_INTERSHELL_SDK_ROOT_PATH

or appropriate bash/batch syntax as applicable.
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] I'm sure this is often asked

2011-07-29 Thread Eric Noulard
2011/7/29 J Decker d3c...@gmail.com:
 Any reason that environment variables can't be used as cmake
 variables?  Like of course any cmake variable in a script would
 override the environment, but if it's not otherwise found, checking in
 the environemnt would make scripts prettier.


 set BUILD_TYPE=debug
 set BUILD_MONOLITHIC=1
 cmake /path/to/source

I think you could build this feature into your CMakeLists.txt already
did you try something like:

if(NOT DEFINED BUILD_TYPE)
  if($ENV{BUILD_TYPE} STRGREATER )
message(BUILD_TYPE set from environment: $ENV{BUILD_TYPE})
set(BUILD_TYPE $ENV{BUILD_TYPE})
  else()
message(BUILD_TYPE is not set)
  endif()
else()
   message(BUILD_TYPE is user defined: ${BUILD_TYPE})
endif()

beware that you may need to:
export BUILD_TYPE=Debug
and not
set BUILD_TYPE=Debug

because is forked by the shell and not a shell script, thus
it lose unexported var.

It should even be doable to write a macro that would conditionnally
setup a list of varname from the environment if the CMake var is not defined.

If you do that send it here of put it on the Wiki, it may be useful for others.

 instead of having to pass -DBUILD_TYPE=debug -DBUILD_MONOLITHIC which
 gets strung out all on one line usually.  some longer varaibles might
 be -DSACK_INTERSHELL_SDK_ROOT_PATH=$SACK_INTERSHELL_SDK_ROOT_PATH

The good thing with the macro trick is that it would work for user
variable as well.

-- 
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


[cmake-developers] [CMake 0012371]: Resource compilation gets wrong parameters on CB+MingW

2011-07-29 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=12371 
== 
Reported By:Michael Broutin
Assigned To:
== 
Project:CMake
Issue ID:   12371
Category:   CMake
Reproducibility:always
Severity:   major
Priority:   normal
Status: new
== 
Date Submitted: 2011-07-29 04:42 EDT
Last Modified:  2011-07-29 04:42 EDT
== 
Summary:Resource compilation gets wrong parameters on
CB+MingW
Description: 
Hi,
First, please see this thread on the Ogre Forum :
http://www.ogre3d.org/forums/viewtopic.php?f=2t=63559

It appears that from CMake 2.8.4 (tested : not fixed in CMake 2.8.5), there's a
problem with resource compiling with mingw : windres.exe is called with what
should be a compiler-only option (something like -msse), so compilation fails...

Right now, the only recommendation is : don't use CMake version above 2.8.3 ...

Is there a better workaround? 
Or can it be fixed within CMake itself?

Steps to Reproduce: 
Get the Ogre source.
Try to compile it with Code::Blocks/MingW (Visual Studio doesn't have this
problem)

Additional Information: 
Attached : CMakeLists.txt from OgreMain
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2011-07-29 04:42 Michael BroutinNew Issue
2011-07-29 04:42 Michael BroutinFile Added: CMakeLists.txt
==

___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] Adding MacroWriteBasicCMakeVersionFile.cmake file to cmake ?

2011-07-29 Thread Alexander Neundorf
On Thursday 07 July 2011, Alexander Neundorf wrote:
 On Thursday 07 July 2011, Brad King wrote:
  On 7/6/2011 4:00 PM, Alexander Neundorf wrote:
   Since that Version.cmake file in most cases looks basically the same
  
  They're only the same within a specific community's versioning scheme.
  The whole reason find_package loads package-provided version check
  files is to avoid imposing a versioning/compatibility scheme.  If
  we provide a template then we should name it after the scheme it
  follows.
  
  Provide a module with macros to generate version files with different
  common schemes.  Use configure_file with CMakeConfigurableFile.in as
  the input if you don't want a custom .in file.
 
 I'd do that, but when I first wrote that file, I was actually surprised
 that I could think of only one way to do it:
 
 if (currentVersion  requestedVersion)
 {
   compatible = false;
 }
 else
 {
   compatible = true;
   if (currentVersion == requestedVersion)
   {
 exact = true;
   }
 }
 
 
 I think everything else are special cases, at least I can't think of other
 generic cases.
 How could another common scheme look like ?

Any ideas ?

Beside that, attached is a modified version which now also fails if 
SIZEOF_VOID_P of the installed version differs from the current on.


Alex
# This is a very basic file for the new style find_package() search mode,
# i.e. Config-mode.
# In this mode find_package() searches for a packageConfig.cmake
# file and an associated packageVersion.cmake file, which it loads to check
# the version number.
# This file can be used with configure_file() to generate such a file for a 
project
# with very basic logic.
# It sets PACKAGE_VERSION_EXACT if the current version string and the requested
# version string are exactly the same and it sets PACKAGE_VERSION_COMPATIBLE
# if the current version is = requested version.
# If this is not good enough for your project, you need to write your own
# improved packageVersion.cmake file.


set(PACKAGE_VERSION @BAR_VERSION_MAJOR@.@BAR_VERSION_MINOR@.@BAR_VERSION_PATCH@)

if(NOT @CMAKE_SIZEOF_VOID_P@  STREQUAL ${CMAKE_SIZEOF_VOID_P})
   math(EXPR installedBits @CMAKE_SIZEOF_VOID_P@ * 8)
   set(PACKAGE_VERSION ${PACKAGE_VERSION} (${installedBits}bit))
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
#   return()
#endif()
else()

if(${PACKAGE_VERSION} VERSION_LESS ${PACKAGE_FIND_VERSION} )
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
else(${PACKAGE_VERSION} VERSION_LESS ${PACKAGE_FIND_VERSION} )
   set(PACKAGE_VERSION_COMPATIBLE TRUE)
   if( ${PACKAGE_FIND_VERSION} STREQUAL ${PACKAGE_VERSION})
  set(PACKAGE_VERSION_EXACT TRUE)
   endif( ${PACKAGE_FIND_VERSION} STREQUAL ${PACKAGE_VERSION})
endif(${PACKAGE_VERSION} VERSION_LESS ${PACKAGE_FIND_VERSION} )

endif()___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] Improved support for using cmake-based libraries in non-cmake projects

2011-07-29 Thread Brad King
On 07/18/2011 03:43 PM, Alexander Neundorf wrote:
 Done. There is now an enum which can have the values SCRIPT_MODE, 
 FIND_PACKAGE_MODE and NORMAL_MODE.

Good.

 So, CMAKE_SIZEOF_VOID_P can be given to the script from the outside via -D.

Good.  This should be encouraged.  Is it feasible to require it?
Does cmake.m4 always know?

 If this is not done, it checks for /usr/lib64. If found - 64bit.
 If it doesn't exist, it then does /usr/bin/file /usr/bin/file, and checks 
 whether the output contains 64-bit. If so - 64bit.

I'm not sure these are good heuristics but I can't think of anything easy
off the top of my head.

 For the multiarch stuff: the script now uses the regexp as defined in 
 Linux.cmake to check whether such a directory exists, and if so, uses the 
 first one found.
 If there are multiple matching directories, this value again has to be given 
 from the outside.

Sounds good.

 I think both issues above should work for all one-architecture installations.

Fair enough.

 Another question: the cmake.m4 is based on the m4-file for pkgconfig, which 
 has the GPL header at the top. So, the cmake.m4 still has that header at the 
 top.
 Is this a problem ?

Yes.  We at least need to distribute the GPL COPYING file with it.  In
the source tree the two files would need to appear together in a directory
separate from any other files.

 I don't know how the license of a file, which is installed by cmake, but not 
 compiled-in nor used by cmake itself influences cmake.

CMake doesn't even invoke the code in that file so the license does not
propagate.  However I'm hesitant to distribute anything with CMake that
is not compatible with our main license.  It will be a PITA to document
the licensing situation properly.

-Brad
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] Improved support for using cmake-based libraries in non-cmake projects

2011-07-29 Thread Alexander Neundorf
On Friday 29 July 2011, Brad King wrote:
 On 07/18/2011 03:43 PM, Alexander Neundorf wrote:
...
  Another question: the cmake.m4 is based on the m4-file for pkgconfig,
  which has the GPL header at the top. So, the cmake.m4 still has that
  header at the top.
  Is this a problem ?
 
 Yes.  We at least need to distribute the GPL COPYING file with it.  In
 the source tree the two files would need to appear together in a directory
 separate from any other files.
 
  I don't know how the license of a file, which is installed by cmake, but
  not compiled-in nor used by cmake itself influences cmake.
 
 CMake doesn't even invoke the code in that file so the license does not
 propagate.  However I'm hesitant to distribute anything with CMake that
 is not compatible with our main license.  It will be a PITA to document
 the licensing situation properly.

Ok. I'll try to find somebody who speaks autoconf/m4 to help me with this 
and write a BSD-licensed file from scratch.
Or do you know somebody who is good at this ?

Alex
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] Adding MacroWriteBasicCMakeVersionFile.cmake file to cmake ?

2011-07-29 Thread Brad King
On 07/29/2011 12:04 PM, Alexander Neundorf wrote:
 On Thursday 07 July 2011, Alexander Neundorf wrote:
 I think everything else are special cases, at least I can't think of other
 generic cases.
 How could another common scheme look like ?
 
 Any ideas ?

Huh.  I thought I responded to this one already but now I can't find it.

Another common scheme is to say that a version is compatible if the
major version number matches and incompatible otherwise.  I'm not
saying we have to try to include every common scheme.  I think just
the basic one you proposed originally is sufficient.  However, I'd
like to come up with a name for it that will distinguish it from
other schemes added in the future.  Any ideas for a name?

 Beside that, attached is a modified version which now also fails if 
 SIZEOF_VOID_P of the installed version differs from the current on.

Nice.

-Brad
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [CMake] VS2010 and superbuild - Fwd: [Ctk-developers] VS2010 support

2011-07-29 Thread Sascha Zelzer

Hi,

Thanks David and Yuri for the information. In my case (with CTK), there 
are no error messages. The download step is successfully completed and 
the following steps are just skipped. VS then reports that everything 
was successfull (or up-to-date).


I will play with your test cases and my VS 2010 installation.

Thanks,
Sascha

On 07/29/2011 12:30 AM, David Cole wrote:

The ExternalProject test in the CMake test suite passes on Visual Studio 2010.

You can see all the variations of ExternalProject usage the test tries
in this file:
http://cmake.org/gitweb?p=cmake.git;a=blob;f=Tests/ExternalProject/CMakeLists.txt;h=4a542d722ff127e672a63082c6bb35de1f3ef9cd;hb=b6fb213ed1431321fab0705beb3aae82f451dcc8

Are there any error messages you get? Or are steps just skipped?

??
David


On Wed, Jul 27, 2011 at 11:38 PM, Yuri Timenkovy...@timenkov.ru  wrote:

I'm not sure I understood your question, but now I use ExternalProject (from
CMake 2.8.4) with Visual Studio 2010 which has 2 externals: one built with
custom command (the C# project) and the second one is CMake-based but with
VC6 generator. Everything compiles and works fine. But I don't have download
step - everything is in my source directory.

The only wish I have I filed to Mantis:
http://public.kitware.com/Bug/view.php?id=12322

Regards,
Yuri

On Thu, Jul 28, 2011 at 12:37 AM, Sascha Zelzer
s.zel...@dkfz-heidelberg.de  wrote:

Hi,

Is nobody on this list using CTK or Slicer with Visual Studio 2010 in
superbuild mode? If you do, could you please post if you had success or not?

Thanks,
Sascha

On 07/22/2011 06:20 PM, Jean-Christophe Fillion-Robin wrote:

Hi Folks,

Before digging further into the problem ... if some your experience issue
with VS2010 and superbuild .. would be great if you could provide more
details about your investigation.

Thanks
Jc

-- Forwarded message --
From: Sascha Zelzers.zel...@dkfz-heidelberg.de
Date: Fri, Jul 22, 2011 at 12:07 PM
Subject: Re: [Ctk-developers] VS2010 support
To: ctk-develop...@commontk.org


Hi,

there is something very strange going on. The generated VS 2010 projects
(I am using the Express editions, 32bit) for the external dependencies like
DCMTK, Log4Qt, etc. only call the download step of the ExternalProject_add
call in our superbuild scripts. The projects are not configured and build.

Did anybody experience the same? I tried with and without the VS 2010 SP1
and with CMake 2.8.4 and 2.8.5.

Thanks,
Sascha

On 07/22/2011 01:39 PM, Sascha Zelzer wrote:

Hi Folks,

I would like to get Visual Studio 2010 compatibility for CTK.

Currently, it looks like I will have to copy ExternalProject.cmake to
CTK for the CMAKE_CACHE_ARGS argument. Then a couple of small
modifications should do.

Any other ideas or objections?

Thanks,

Sascha
___
Ctk-developers mailing list
ctk-develop...@commontk.org
http://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers

___
Ctk-developers mailing list
ctk-develop...@commontk.org
http://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers



--
+1 919 869 8849



___
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] Buggy CPack generator behaviour?

2011-07-29 Thread Eric Noulard
2011/7/29 Bjørn Forsman bjorn.fors...@gmail.com:

 As you guessed this is impossible without backward compat' breakage.
 e.g. be aware that with CPACK_SET_DESTDIR set to ON RPM and DEB
 behavior changes
 namely RPM package built with that may not be relocatable.

 What do you mean with 'not relocatable'? I didn't see any difference
 in the archive layouts of RPM and DEB when changing CPACK_SET_DESTIR
 from 'not set' to ON.

if you do:

rpm -qpi your.rpm

you'll see a line like:

Relocations : (not relocatable)
or
Relocations : /usr

When an rpm is relocatable you can do

rpm -i  --prefix=/your/relocation/prefix your.rpm

if the rpm is not relocatable you can't.

 Didn't you say that RPM and DEB generators sets
 CPACK_SET_DESTDIR=ON *itself*?

Yes but not too soon (CPack internal step are indeed multiple) such that
CPack can effectively collect files which are installed purposely with
ABSOLUTE path and
treat them as config file in RPM specification file.

When DESTDIR is set to ON by the user CPack cannot do this work
properly, and spit out a
warning like:

CPackRPM:Warning: CPACK_SET_DESTDIR is set (=ON) while requesting a
relocatable package (CPACK_RPM_PACKAGE_RELOCATABLE is set): this is
not supported, the package won't be relocatable.

 You may set(CPACK_SET_DESTDIR ON) only for ArchiveGenerator if you
 use CPACK_CONFIG_PROJECT_FILE.

 Huh?

 I have never used CPACK_CONFIG_PROJECT_FILE, I just
 set(CPACK_SET_DESTDIR ON) in CMakeLists.txt and it fixed absolute
 DESTINATION paths for the archive generators. Just like you said in
 the first email. (Yay!)

Because you wanted to go along the fast path and I cannot blame you
but I did Indeed indicate in my firts e-mail:

If you want to do some specific adjustment depending on the CPack
generator used
you may use a CPACK_PROJECT_CONFIG_FILE see doc here:
http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#Overall_usage_.28common_to_all_generators.29;

Now that the fast path works for you
I thought you may be interested in your CPack config fine tuning.

Read the link here:
http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#Overall_usage_.28common_to_all_generators.29

and you'll see that you can setup diferent value of CPACK_whateever
var depending on the CPack Generator
which is run.

Obviously this is not mandatory in your case because you already get
what you want,
but may be you want to try.

-- 
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org
___
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] Buggy CPack generator behaviour?

2011-07-29 Thread Bjørn Forsman
2011/7/29 Eric Noulard eric.noul...@gmail.com:
 2011/7/29 Bjørn Forsman bjorn.fors...@gmail.com:
 What do you mean with 'not relocatable'? I didn't see any difference
 in the archive layouts of RPM and DEB when changing CPACK_SET_DESTIR
 from 'not set' to ON.

 if you do:

 rpm -qpi your.rpm

 you'll see a line like:

 Relocations : (not relocatable)
 or
 Relocations : /usr

 When an rpm is relocatable you can do

 rpm -i  --prefix=/your/relocation/prefix your.rpm

 if the rpm is not relocatable you can't.

Aha, I see.

 Didn't you say that RPM and DEB generators sets
 CPACK_SET_DESTDIR=ON *itself*?

 Yes but not too soon (CPack internal step are indeed multiple) such that
 CPack can effectively collect files which are installed purposely with
 ABSOLUTE path and
 treat them as config file in RPM specification file.

 When DESTDIR is set to ON by the user CPack cannot do this work
 properly, and spit out a
 warning like:

 CPackRPM:Warning: CPACK_SET_DESTDIR is set (=ON) while requesting a
 relocatable package (CPACK_RPM_PACKAGE_RELOCATABLE is set): this is
 not supported, the package won't be relocatable.

Aha, I see that now.

 I have never used CPACK_CONFIG_PROJECT_FILE, I just
 set(CPACK_SET_DESTDIR ON) in CMakeLists.txt and it fixed absolute
 DESTINATION paths for the archive generators. Just like you said in
 the first email. (Yay!)

 Because you wanted to go along the fast path and I cannot blame you
 but I did Indeed indicate in my firts e-mail:

 If you want to do some specific adjustment depending on the CPack
 generator used
 you may use a CPACK_PROJECT_CONFIG_FILE see doc here:
 http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#Overall_usage_.28common_to_all_generators.29;

 Now that the fast path works for you
 I thought you may be interested in your CPack config fine tuning.

 Read the link here:
 http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#Overall_usage_.28common_to_all_generators.29

 and you'll see that you can setup diferent value of CPACK_whateever
 var depending on the CPack Generator
 which is run.

 Obviously this is not mandatory in your case because you already get
 what you want,
 but may be you want to try.

Thanks a lot for the pointers.

Best regards,
Bjørn Forsman
___
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] Install files quietly

2011-07-29 Thread Mathias Tausig
Hello!

During the installation process, I am copying a quite large directory using
INSTALL(DIRECTORY foo DESTINATION bar)

When I run make install, every single file contained in foo is displayed
in the shell. Is there some way to prevent a install command from
printing to the command line?

regards
Mathias



smime.p7s
Description: S/MIME Cryptographic Signature
___
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] VS2010 and superbuild - Fwd: [Ctk-developers] VS2010 support

2011-07-29 Thread David Cole
Is your VS 2010 in German by any chance? (Or the path name to the
installation of VS 2010?)

We do not typically test on non-English platforms or build tools...


On Fri, Jul 29, 2011 at 2:14 AM, Sascha Zelzer
s.zel...@dkfz-heidelberg.dewrote:

 Hi,

 Thanks David and Yuri for the information. In my case (with CTK), there are
 no error messages. The download step is successfully completed and the
 following steps are just skipped. VS then reports that everything was
 successfull (or up-to-date).

 I will play with your test cases and my VS 2010 installation.

 Thanks,
 Sascha


 On 07/29/2011 12:30 AM, David Cole wrote:

 The ExternalProject test in the CMake test suite passes on Visual Studio
 2010.

 You can see all the variations of ExternalProject usage the test tries
 in this file:
 http://cmake.org/gitweb?p=**cmake.git;a=blob;f=Tests/**
 ExternalProject/CMakeLists.**txt;h=**4a542d722ff127e672a63082c6bb35**
 de1f3ef9cd;hb=**b6fb213ed1431321fab0705beb3aae**82f451dcc8http://cmake.org/gitweb?p=cmake.git;a=blob;f=Tests/ExternalProject/CMakeLists.txt;h=4a542d722ff127e672a63082c6bb35de1f3ef9cd;hb=b6fb213ed1431321fab0705beb3aae82f451dcc8

 Are there any error messages you get? Or are steps just skipped?

 ??
 David


 On Wed, Jul 27, 2011 at 11:38 PM, Yuri Timenkovy...@timenkov.ru  wrote:

 I'm not sure I understood your question, but now I use ExternalProject
 (from
 CMake 2.8.4) with Visual Studio 2010 which has 2 externals: one built
 with
 custom command (the C# project) and the second one is CMake-based but
 with
 VC6 generator. Everything compiles and works fine. But I don't have
 download
 step - everything is in my source directory.

 The only wish I have I filed to Mantis:
 http://public.kitware.com/Bug/**view.php?id=12322http://public.kitware.com/Bug/view.php?id=12322

 Regards,
 Yuri

 On Thu, Jul 28, 2011 at 12:37 AM, Sascha Zelzer
 s.zel...@dkfz-heidelberg.de  wrote:

 Hi,

 Is nobody on this list using CTK or Slicer with Visual Studio 2010 in
 superbuild mode? If you do, could you please post if you had success or
 not?

 Thanks,
 Sascha

 On 07/22/2011 06:20 PM, Jean-Christophe Fillion-Robin wrote:

 Hi Folks,

 Before digging further into the problem ... if some your experience
 issue
 with VS2010 and superbuild .. would be great if you could provide more
 details about your investigation.

 Thanks
 Jc

 -- Forwarded message --
 From: Sascha 
 Zelzers.zelzer@dkfz-**heidelberg.des.zel...@dkfz-heidelberg.de
 
 Date: Fri, Jul 22, 2011 at 12:07 PM
 Subject: Re: [Ctk-developers] VS2010 support
 To: ctk-develop...@commontk.org


 Hi,

 there is something very strange going on. The generated VS 2010 projects
 (I am using the Express editions, 32bit) for the external dependencies
 like
 DCMTK, Log4Qt, etc. only call the download step of the
 ExternalProject_add
 call in our superbuild scripts. The projects are not configured and
 build.

 Did anybody experience the same? I tried with and without the VS 2010
 SP1
 and with CMake 2.8.4 and 2.8.5.

 Thanks,
 Sascha

 On 07/22/2011 01:39 PM, Sascha Zelzer wrote:

 Hi Folks,

 I would like to get Visual Studio 2010 compatibility for CTK.

 Currently, it looks like I will have to copy ExternalProject.cmake to
 CTK for the CMAKE_CACHE_ARGS argument. Then a couple of small
 modifications should do.

 Any other ideas or objections?

 Thanks,

 Sascha
 __**_
 Ctk-developers mailing list
 ctk-develop...@commontk.org
 http://public.kitware.com/cgi-**bin/mailman/listinfo/ctk-**developershttp://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers

 __**_
 Ctk-developers mailing list
 ctk-develop...@commontk.org
 http://public.kitware.com/cgi-**bin/mailman/listinfo/ctk-**developershttp://public.kitware.com/cgi-bin/mailman/listinfo/ctk-developers



 --
 +1 919 869 8849



 __**_
 Powered by www.kitware.com

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

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

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


 __**_
 Powered by www.kitware.com

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

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

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



___
Powered by www.kitware.com

Visit other Kitware open-source 

Re: [CMake] VS2010 and superbuild - Fwd: [Ctk-developers] VS2010 support

2011-07-29 Thread David Cole
Can you send along the output that you do see when your project is
downloading, and the build output that immediately follows that? Does it say
anything about the steps that come after download?

For example, when I build the ExternalProject test and build only the
project TutorialStep5-Local, I get the following output:

1  Performing download step (DIR copy) for 'TutorialStep5-Local'
1  No update step for 'TutorialStep5-Local'
1  No patch step for 'TutorialStep5-Local'
1  Performing configure step for 'TutorialStep5-Local'
1  loading initial cache file C:/Users/davidcole/Dashboards/My
Tests/b20/CMakeExternals/tmp/TutorialStep5-Local/TutorialStep5-Local-cache.cmake
1  -- Check for working C compiler using: Visual Studio 10
1  -- Check for working C compiler using: Visual Studio 10 -- works
1  -- Detecting C compiler ABI info
1  -- Detecting C compiler ABI info - done
1  -- Check for working CXX compiler using: Visual Studio 10
1  -- Check for working CXX compiler using: Visual Studio 10 -- works
1  -- Detecting CXX compiler ABI info
1  -- Detecting CXX compiler ABI info - done
1  -- Looking for log
1  -- Looking for log - found
1  -- Looking for exp
1  -- Looking for exp - found
1  -- Configuring done
1  -- Generating done
1  -- Build files have been written to: C:/Users/davidcole/Dashboards/My
Tests/b20/CMakeExternals/Build/TutorialStep5-Local
1  Performing build step for 'TutorialStep5-Local'
.


Do you see any Performing XXX step or No XXX step output after the
download occurs...?



On Fri, Jul 29, 2011 at 6:30 AM, David Cole david.c...@kitware.com wrote:

 Is your VS 2010 in German by any chance? (Or the path name to the
 installation of VS 2010?)

 We do not typically test on non-English platforms or build tools...



 On Fri, Jul 29, 2011 at 2:14 AM, Sascha Zelzer 
 s.zel...@dkfz-heidelberg.de wrote:

 Hi,

 Thanks David and Yuri for the information. In my case (with CTK), there
 are no error messages. The download step is successfully completed and the
 following steps are just skipped. VS then reports that everything was
 successfull (or up-to-date).

 I will play with your test cases and my VS 2010 installation.

 Thanks,
 Sascha


 On 07/29/2011 12:30 AM, David Cole wrote:

 The ExternalProject test in the CMake test suite passes on Visual Studio
 2010.

 You can see all the variations of ExternalProject usage the test tries
 in this file:
 http://cmake.org/gitweb?p=**cmake.git;a=blob;f=Tests/**
 ExternalProject/CMakeLists.**txt;h=**4a542d722ff127e672a63082c6bb35**
 de1f3ef9cd;hb=**b6fb213ed1431321fab0705beb3aae**82f451dcc8http://cmake.org/gitweb?p=cmake.git;a=blob;f=Tests/ExternalProject/CMakeLists.txt;h=4a542d722ff127e672a63082c6bb35de1f3ef9cd;hb=b6fb213ed1431321fab0705beb3aae82f451dcc8

 Are there any error messages you get? Or are steps just skipped?

 ??
 David


 On Wed, Jul 27, 2011 at 11:38 PM, Yuri Timenkovy...@timenkov.ru
  wrote:

 I'm not sure I understood your question, but now I use ExternalProject
 (from
 CMake 2.8.4) with Visual Studio 2010 which has 2 externals: one built
 with
 custom command (the C# project) and the second one is CMake-based but
 with
 VC6 generator. Everything compiles and works fine. But I don't have
 download
 step - everything is in my source directory.

 The only wish I have I filed to Mantis:
 http://public.kitware.com/Bug/**view.php?id=12322http://public.kitware.com/Bug/view.php?id=12322

 Regards,
 Yuri

 On Thu, Jul 28, 2011 at 12:37 AM, Sascha Zelzer
 s.zel...@dkfz-heidelberg.de  wrote:

 Hi,

 Is nobody on this list using CTK or Slicer with Visual Studio 2010 in
 superbuild mode? If you do, could you please post if you had success or
 not?

 Thanks,
 Sascha

 On 07/22/2011 06:20 PM, Jean-Christophe Fillion-Robin wrote:

 Hi Folks,

 Before digging further into the problem ... if some your experience
 issue
 with VS2010 and superbuild .. would be great if you could provide more
 details about your investigation.

 Thanks
 Jc

 -- Forwarded message --
 From: Sascha 
 Zelzers.zelzer@dkfz-**heidelberg.des.zel...@dkfz-heidelberg.de
 
 Date: Fri, Jul 22, 2011 at 12:07 PM
 Subject: Re: [Ctk-developers] VS2010 support
 To: ctk-develop...@commontk.org


 Hi,

 there is something very strange going on. The generated VS 2010
 projects
 (I am using the Express editions, 32bit) for the external dependencies
 like
 DCMTK, Log4Qt, etc. only call the download step of the
 ExternalProject_add
 call in our superbuild scripts. The projects are not configured and
 build.

 Did anybody experience the same? I tried with and without the VS 2010
 SP1
 and with CMake 2.8.4 and 2.8.5.

 Thanks,
 Sascha

 On 07/22/2011 01:39 PM, Sascha Zelzer wrote:

 Hi Folks,

 I would like to get Visual Studio 2010 compatibility for CTK.

 Currently, it looks like I will have to copy ExternalProject.cmake to
 CTK for the CMAKE_CACHE_ARGS argument. Then a couple of small
 modifications should do.

 Any other ideas or objections?

 Thanks,

 Sascha
 

Re: [CMake] Bug fix requests for the *next* release of CMake...

2011-07-29 Thread David Cole
On Thu, Jul 28, 2011 at 8:32 PM, Jean-Christophe Fillion-Robin 
jchris.filli...@kitware.com wrote:

 Make sure
 http://cmake.org/gitweb?p=cmake.git;a=commit;h=702538eaa3315f3fcad9f1daea01e6a83928967bis
  integrated to CMake 2.8.6

 Thanks
 Jc


This commit is already in 'master' which means it will automatically be in
2.8.6 unless a further commit also merged to 'master' negates its effect
It should be in 2.8.6.

Thanks,
David
___
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] Buggy CPack generator behaviour?

2011-07-29 Thread Hendrik Sattler

Zitat von Eric Noulard eric.noul...@gmail.com:


2011/7/29 Bjørn Forsman bjorn.fors...@gmail.com:


As you guessed this is impossible without backward compat' breakage.
e.g. be aware that with CPACK_SET_DESTDIR set to ON RPM and DEB
behavior changes
namely RPM package built with that may not be relocatable.


What do you mean with 'not relocatable'? I didn't see any difference
in the archive layouts of RPM and DEB when changing CPACK_SET_DESTIR
from 'not set' to ON.


if you do:

rpm -qpi your.rpm

you'll see a line like:

Relocations : (not relocatable)
or
Relocations : /usr

When an rpm is relocatable you can do

rpm -i  --prefix=/your/relocation/prefix your.rpm

if the rpm is not relocatable you can't.


That makes it hard to install stuff that MUST be in specific  
directories like e.g. udev rules or files that the software expects in  
/etc (_nobody_ uses /usr/etc). Any package that installs files there  
are not relocatable? That makes this feature pretty useless...


HS

___
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] LINK_DIRECTORIES visual studio 2010

2011-07-29 Thread Louis Hoefler

Hello everyone.
I have a simple CMake file

cmake_minimum_required(VERSION 2.8)

IF(DEFINED USEFCGI)
 SET(BACKENDLIB wtfcgi)
ELSE(DEFINED USEFCGI)
 SET(BACKENDLIB wthttp)
ENDIF(DEFINED USEFCGI)

ADD_EXECUTABLE(construction.wt
 construction.cpp
)

if(WIN32)
 INCLUDE_DIRECTORIES(D:/work/boost_1_46_1 D:/work/wt-3.1.10/src 
D:/work/wt-3.1.10/build)
 LINK_DIRECTORIES(D:/work/wt-3.1.10/build/src/Release 
D:/work/wt-3.1.10/build/src/http/Release)

else(WIN32)
 INCLUDE_DIRECTORIES(/usr/include/Wt)
endif(WIN32)

# For FastCGI deployment:
TARGET_LINK_LIBRARIES(construction.wt ${BACKENDLIB} wt)

If I use this file for visual studio 2010 project file generation the 
paths in LINK_DIRECTORIES are not set. What am I doing wrong?


Thank you, Louis
___
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] Bug fix requests for the *next* release of CMake...

2011-07-29 Thread Alexander Neundorf
On Friday 29 July 2011, David Cole wrote:
 Hi all,
 
 Replies requested. Short replies only. Read on. Just a short reply with bug
 numbers or links to the bugs is all we need here. Please move specific
 discussions into the bugs themselves or start a new thread to talk about
 it... Replies on this thread should just be a collector for bug numbers.
 
 Example one-line reply:
 
   http://public.kitware.com/Bug/view.php?id=8707
 
 We are planning for CMake 2.8.6 already, and it's going to be a compressed
 release cycle this time around. We're targeting Sept. 14, 2011 for
 releasing it, and in order to make that happen we'll have to do an rc1
 as early as Aug 10th or 17th... just 2 or 3 weeks from now.

From the KDE point of view this is somewhat unfortunate, that exactly this 
cycle will be shorter.
Are there reasons for it ?

With the coming Qt5 and the binary break this causes in KDE we plan to also 
break binary compatibility once (while keeping source compatibility similar to 
Qt more or less completely).

With this break we will also use the chance to break our cmake source 
compatiblity once, the first time since KDE 4.0.0 in early 2007.
Which means we try to merge a lot of our stuff into cmake, and then depend on 
this version of cmake, i.e. 2.8.6.
2.8.7 will be released maybe around January or so, right ? This would be quite 
late for us.
This does not just mean merge, but also change it so it becomes acceptable for 
cmake, etc.

This is the list of files in KDE which are potential candidates for being 
upstreamed:
http://community.kde.org/index.php?title=KDE_Core/Platform_11/Buildsystem/FindFilesSurvey

Not all files listed on this page have realistic chances IMO.
But I'd really like to get rid of the copies in KDE of the files in the 
sections 2 Check*.cmake files, 3 Generic Macros and 5.1.1 Find*.cmake 
from kdelibs which exist in cmake.

If you look there, already in these three sections there are still a lot of 
files marked as TODO.
Getting all that done until August 10th is hard, to say the least. Also now is 
the time for summer vacations, which makes it even more hard.

So, from our (KDE) side being able to work on the stuff listed on the page 
linked above until like end of September would be ideal.
(additionally there are the things like automoc which I already started 
discussing on the cmake developers list).

Alex

___
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] Assembler handling in 2.8.5 vs 2.8.4

2011-07-29 Thread Alexander Neundorf
On Friday 29 July 2011, Florian Reinhard wrote:
 Yay! Native support for cl6x TI compiler! :)
 
 2011/7/22 Alexander Neundorf a.neundorf-w...@gmx.net:
  Can you build cmake from this branch I just created ?
  http://cmake.org/gitweb?p=stage/cmake.git;a=shortlog;h=refs/heads/TI_DSP_
  Compiler
 
 Tested and failed:
 #cmake --version
 cmake version 2.8.5.20110722
 
 #cmake -GMinGW Makefiles -DCMAKE_BUILD_TYPE=release ..
 -- Archiver: c:/tools/cgtools-7.2.4/bin/ar6x.exe
 -- The C compiler identification is TI_DSP
 -- The CXX compiler identification is TI_DSP
 -- Check for working C compiler: c:/tools/cgtools-7.2.4/bin/cl6x.exe
 terminate called after throwing an instance of 'std::logic_error'
   what():  basic_string::_S_construct NULL not valid

Can you maybe run it in a debugger so we can get a backtrace ?
 
 This application has requested the Runtime to terminate it in an unusual
 way. Please contact the application's support team for more information.
 
  It has basic support for the TI compiler, see the files
  Modules/Compiler/TI_DSP-*.cmake.
  
  At least I was able to compile and link C, C++ and an assembler file.
  
  It should also work to copy these three files simply in the
  Modules/Compiler/ directory of your installed cmake, but you need at
  least CMake 2.8.4.
 
 Tested with 2.8.5, fails as well in the same way. I guess because it
 comliles something and tries to execute it?

No, most probably not.
At that point, cmake compiles and links a few files, but does not try to run 
them. It only tries to extract strings from them.
 
 I had to disable some tests to get rid of the crash:
 SET (CMAKE_C_COMPILER_WORKS   1)
 SET (CMAKE_CXX_COMPILER_WORKS 1)
 SET (CMAKE_DETERMINE_C_ABI_COMPILED   1)
 SET (CMAKE_DETERMINE_CXX_ABI_COMPILED 1)
 SET (CMAKE_DETERMINE_ASM_ABI_COMPILED 1)


This shouldn't be necessary, and it was working for me without it (under 
Linux).


 Thatway ENABLE_LANGUAGE (ASM) did work.
 
  I'm quite sure these files are not complete.
  Please give them a try and I'd be happy about patches to make them really
  work.
 
 Here's what i've found:
 Having OBJECTS as first argument didn't work for me, putting them at
 the end of the list made my project link.
 set(CMAKE_C_LINK_EXECUTABLE CMAKE_C_COMPILER --run_linker
 --output_file=TARGET CMAKE_C_LINK_FLAGS LINK_FLAGS
 LINK_LIBRARIES OBJECTS)
 
 Running on windows the output file extension is by default .exe which
 doesn't make sense, since there will be probably nobody compiling for
 the C6000 family on a C6000 system. So i guess having this would make
 sense:
 SET (CMAKE_EXECUTABLE_SUFFIX.out)

This depends also on your target operating system. For which OS are you 
developing ?

 Thank you again and I'll spend more time on testing next week. If you
 need to i'd provide patches on a clone on github.

Yes, that'd be good.

Alex

P.S. please keep the mailing list on CC
___
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] LINK_DIRECTORIES visual studio 2010

2011-07-29 Thread Michael Hertling
On 07/29/2011 05:13 PM, Louis Hoefler wrote:
 Hello everyone.
 I have a simple CMake file
 
 cmake_minimum_required(VERSION 2.8)
 
 IF(DEFINED USEFCGI)
   SET(BACKENDLIB wtfcgi)
 ELSE(DEFINED USEFCGI)
   SET(BACKENDLIB wthttp)
 ENDIF(DEFINED USEFCGI)
 
 ADD_EXECUTABLE(construction.wt
   construction.cpp
 )
 
 if(WIN32)
   INCLUDE_DIRECTORIES(D:/work/boost_1_46_1 D:/work/wt-3.1.10/src 
 D:/work/wt-3.1.10/build)
   LINK_DIRECTORIES(D:/work/wt-3.1.10/build/src/Release 
 D:/work/wt-3.1.10/build/src/http/Release)
 else(WIN32)
   INCLUDE_DIRECTORIES(/usr/include/Wt)
 endif(WIN32)
 
 # For FastCGI deployment:
 TARGET_LINK_LIBRARIES(construction.wt ${BACKENDLIB} wt)
 
 If I use this file for visual studio 2010 project file generation the 
 paths in LINK_DIRECTORIES are not set. What am I doing wrong?
 
 Thank you, Louis

The command will apply only to targets created *after* it is called.

(LINK_DIRECTORIES()'s documentation)

Regards,

Michael
___
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] LINK_DIRECTORIES visual studio 2010

2011-07-29 Thread Louis Hoefler

Ah, yes this one works:
cmake_minimum_required(VERSION 2.8)

IF(DEFINED USEFCGI)
 SET(BACKENDLIB wtfcgi)
ELSE(DEFINED USEFCGI)
 SET(BACKENDLIB wthttp)
ENDIF(DEFINED USEFCGI)

if(WIN32)
 INCLUDE_DIRECTORIES(D:/work/boost_1_46_1 D:/work/wt-3.1.10/src 
D:/work/wt-3.1.10/build)
 LINK_DIRECTORIES(D:/work/wt-3.1.10/build/src/Release 
D:/work/wt-3.1.10/build/src/http/Release)

else(WIN32)
 INCLUDE_DIRECTORIES(/usr/include/Wt)
endif(WIN32)

ADD_EXECUTABLE(construction.wt
 construction.cpp
)

TARGET_LINK_LIBRARIES(construction.wt wt ${BACKENDLIB})

Moved the ADD_EXECUTABLE below the LINK_DIRECTORIES.

Thank you, Louis

Am 29.07.2011 17:32, schrieb Michael Hertling:

The command will apply only to targets created *after* it is called.

(LINK_DIRECTORIES()'s documentation)

Regards,

Michael
___
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] Bug fix requests for the *next* release of CMake...

2011-07-29 Thread Sean McBride
bugs:
http://public.kitware.com/Bug/view.php?id=11746
http://public.kitware.com/Bug/view.php?id=8563
http://public.kitware.com/Bug/view.php?id=6215
http://public.kitware.com/Bug/view.php?id=7867
http://public.kitware.com/Bug/view.php?id=10895

features:
http://public.kitware.com/Bug/view.php?id=12300

not a bug, but a distribution consideration:
http://public.kitware.com/Bug/view.php?id=9839

Cheers!

Sean


___
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] Bug fix requests for the *next* release of CMake...

2011-07-29 Thread David Cole
2011/7/29 Alexander Neundorf a.neundorf-w...@gmx.net

 On Friday 29 July 2011, David Cole wrote:
  Hi all,
 
  Replies requested. Short replies only. Read on. Just a short reply with
 bug
  numbers or links to the bugs is all we need here. Please move specific
  discussions into the bugs themselves or start a new thread to talk about
  it... Replies on this thread should just be a collector for bug numbers.
 
  Example one-line reply:
 
http://public.kitware.com/Bug/view.php?id=8707
 
  We are planning for CMake 2.8.6 already, and it's going to be a
 compressed
  release cycle this time around. We're targeting Sept. 14, 2011 for
  releasing it, and in order to make that happen we'll have to do an rc1
  as early as Aug 10th or 17th... just 2 or 3 weeks from now.

 From the KDE point of view this is somewhat unfortunate, that exactly this
 cycle will be shorter.
 Are there reasons for it ?


There are reasons for it. For one thing, the 2.8.5 release took too long, so
we want to make this one shorter to keep us on schedule for getting 4
releases per year out there. If we can actually deliver 2.8.6 on Sept. 14th,
we can reliably plan on 2.8.7 being delivered in mid-December.

It may be unfortunate, but we will stick with it unless we receive mucho
objections from others in addition to KDE.

Is mid-December too far in the future? (And a minimum version of 2.8.7...?)



 With the coming Qt5 and the binary break this causes in KDE we plan to also
 break binary compatibility once (while keeping source compatibility similar
 to
 Qt more or less completely).


When is the Qt5 release scheduled for?




 With this break we will also use the chance to break our cmake source
 compatiblity once, the first time since KDE 4.0.0 in early 2007.
 Which means we try to merge a lot of our stuff into cmake, and then depend
 on
 this version of cmake, i.e. 2.8.6.
 2.8.7 will be released maybe around January or so, right ? This would be
 quite
 late for us.
 This does not just mean merge, but also change it so it becomes acceptable
 for
 cmake, etc.

 This is the list of files in KDE which are potential candidates for being
 upstreamed:

 http://community.kde.org/index.php?title=KDE_Core/Platform_11/Buildsystem/FindFilesSurvey

 Not all files listed on this page have realistic chances IMO.
 But I'd really like to get rid of the copies in KDE of the files in the
 sections 2 Check*.cmake files, 3 Generic Macros and 5.1.1 Find*.cmake
 from kdelibs which exist in cmake.

 If you look there, already in these three sections there are still a lot of
 files marked as TODO.
 Getting all that done until August 10th is hard, to say the least. Also now
 is
 the time for summer vacations, which makes it even more hard.

 So, from our (KDE) side being able to work on the stuff listed on the page
 linked above until like end of September would be ideal.
 (additionally there are the things like automoc which I already started
 discussing on the cmake developers list).

 Alex


That is an ambitious amount of work. I'm skeptical that we could even fit
all that into a mid-September rc1, let alone a mid-August rc1... It would
probably be better if you shoot for getting that in by November, and
counting on a December release of CMake 2.8.7.

Let me know if you have further thoughts or comments here.

Thanks,
David
___
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] TARGET_LINK_LIBRARIES debug optimized visual studio 2010

2011-07-29 Thread Louis Hoefler

Hello everyone.
I try to set a specific library for the debug and release configuration.

I try to do it this way:
IF(DEFINED USEFCGI)
 SET(BACKENDLIB wtfcgi)
ELSE(DEFINED USEFCGI)
 SET(BACKENDLIB wthttp)
ENDIF(DEFINED USEFCGI)

IF(WIN32)
 TARGET_LINK_LIBRARIES(construction.wt
  debug wtd ${BACKENDLIB}d
  optimized wt ${BACKENDLIB})
ELSE(WIN32)
 TARGET_LINK_LIBRARIES(construction.wt wt ${BACKENDLIB})
ENDIF(WIN32)

but the resulting libraries for debug are:
wtd.lib;wthttpd.lib;wthttp.lib
and for release:
wthttpd.lib;wt.lib;wthttp.lib

what am I doing wrong here?

Thank you again, Louis

___
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] CMake QT4 toolbar icons disappear

2011-07-29 Thread James Sutherland
The icons are all *.tif images.
Would that require a plugin?  Do you happen to know what one?
James


On Thu, Jul 28, 2011 at 9:33 PM, clin...@elemtech.com
clin...@elemtech.comwrote:

 Sounds like your icons are in a format supported by a plugin, and the
 installation has missing that plugin.

 Clint


 - Reply message -
 From: James Sutherland james.sutherl...@utah.edu
 Date: Thu, Jul 28, 2011 8:01 pm
 Subject: [CMake] CMake QT4 toolbar icons disappear
 To: cmake cmake@cmake.org

 I have a QT4 application that I am building via CMake.

 In the build directory where the local application is built, it works
 fine.

 In the install directory, that application is missing all toolbar icons
 when it runs (but is otherwise functional).

 Any ideas what could be causing this?  It must have something to do with
 the installation process I guess?

 FWIW, I followed the example code at the link on
 http://www.vtk.org/Wiki/BundleUtilitiesExample

 James

 ___
 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] CMake QT4 toolbar icons disappear

2011-07-29 Thread David Cole
Probably qtiff4 ...

You can see the available ones in your Qt build tree at plugins/imageformats


On Fri, Jul 29, 2011 at 12:10 PM, James Sutherland
james.sutherl...@utah.edu wrote:
 The icons are all *.tif images.
 Would that require a plugin?  Do you happen to know what one?
 James

 On Thu, Jul 28, 2011 at 9:33 PM, clin...@elemtech.com clin...@elemtech.com
 wrote:

 Sounds like your icons are in a format supported by a plugin, and the
 installation has missing that plugin.

 Clint

 - Reply message -
 From: James Sutherland james.sutherl...@utah.edu
 Date: Thu, Jul 28, 2011 8:01 pm
 Subject: [CMake] CMake QT4 toolbar icons disappear
 To: cmake cmake@cmake.org

 I have a QT4 application that I am building via CMake.
 In the build directory where the local application is built, it works
 fine.
 In the install directory, that application is missing all toolbar icons
 when it runs (but is otherwise functional).
 Any ideas what could be causing this?  It must have something to do with
 the installation process I guess?
 FWIW, I followed the example code at the link
 on http://www.vtk.org/Wiki/BundleUtilitiesExample
 James
 ___
 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] TARGET_LINK_LIBRARIES debug optimized visual studio 2010

2011-07-29 Thread David Cole
Don't put a space in between the wt and the ${BACKENDLIB} ... ?

Use this instead:

IF(WIN32)
 TARGET_LINK_LIBRARIES(construction.wt
  debug wtd${BACKENDLIB}d
  optimized wt${BACKENDLIB})
ELSE(WIN32)
 TARGET_LINK_LIBRARIES(construction.wt wt${BACKENDLIB})
ENDIF(WIN32)

Just a guess since I don't really know what you're expecting...


On Fri, Jul 29, 2011 at 12:02 PM, Louis Hoefler louis.hoef...@gmx.de wrote:

 Hello everyone.
 I try to set a specific library for the debug and release configuration.

 I try to do it this way:
 IF(DEFINED USEFCGI)
  SET(BACKENDLIB wtfcgi)
 ELSE(DEFINED USEFCGI)
  SET(BACKENDLIB wthttp)
 ENDIF(DEFINED USEFCGI)

 IF(WIN32)
  TARGET_LINK_LIBRARIES(construction.wt
  debug wtd ${BACKENDLIB}d
  optimized wt ${BACKENDLIB})
 ELSE(WIN32)
  TARGET_LINK_LIBRARIES(construction.wt wt ${BACKENDLIB})
 ENDIF(WIN32)

 but the resulting libraries for debug are:
 wtd.lib;wthttpd.lib;wthttp.lib
 and for release:
 wthttpd.lib;wt.lib;wthttp.lib

 what am I doing wrong here?

 Thank you again, Louis

 ___
 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] TARGET_LINK_LIBRARIES debug optimized visual studio 2010

2011-07-29 Thread Louis Hoefler

I tried that and now I get
for the debug libraries:
...;wtdwthttpd.lib;...
for the release libraries:
...;wtwthttp.lib;...

I want it to look like
...;wt.lib;wthttp.lib;... or ...;wtd.lib;wthttpd.lib;...
my version somehow adds one release
library to the debug configuration and
vice versa (...;wthttpd.lib;wt.lib;wthttp.lib;...).

Sorry for not mentioning this.
Thank you, Louis

Am 29.07.2011 18:12, schrieb David Cole:

Don't put a space in between the wt and the ${BACKENDLIB} ... ?

Use this instead:

IF(WIN32)
  TARGET_LINK_LIBRARIES(construction.wt
   debug wtd${BACKENDLIB}d
   optimized wt${BACKENDLIB})
ELSE(WIN32)
  TARGET_LINK_LIBRARIES(construction.wt wt${BACKENDLIB})
ENDIF(WIN32)

Just a guess since I don't really know what you're expecting...


On Fri, Jul 29, 2011 at 12:02 PM, Louis Hoeflerlouis.hoef...@gmx.de  wrote:

Hello everyone.
I try to set a specific library for the debug and release configuration.

I try to do it this way:
IF(DEFINED USEFCGI)
  SET(BACKENDLIB wtfcgi)
ELSE(DEFINED USEFCGI)
  SET(BACKENDLIB wthttp)
ENDIF(DEFINED USEFCGI)

IF(WIN32)
  TARGET_LINK_LIBRARIES(construction.wt
  debug wtd ${BACKENDLIB}d
  optimized wt ${BACKENDLIB})
ELSE(WIN32)
  TARGET_LINK_LIBRARIES(construction.wt wt ${BACKENDLIB})
ENDIF(WIN32)



___
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] Cross Compiling with cmake 2.8.5

2011-07-29 Thread Alexander Neundorf
On Wednesday 27 July 2011, r.cze...@esa-grimma.de wrote:
 Hi all,
 
 I tried to cross-compile an internal application for windows on a linux
 machine,
 but failed, because cmake at some point re-start the configure process,
 and
 drops the CMAKE_SYSTEM_NAME variable along that way. Attached is a
 minimal CMakeLists.txt, which reproduces the problem.
 
 Is there a way to avoid the reconfiguration?

Did you try to use a toolchain file as described in the cmake cross compiling 
wiki page ?
http://www.vtk.org/Wiki/CMake_Cross_Compiling
It even has a separate link for mingw.

Without it, the CMAKE_SYSTEM_NAME you have set via -D probably doesn't make it 
into the try_compile()-projects.

Alex
___
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] TARGET_LINK_LIBRARIES debug optimized visual studio 2010

2011-07-29 Thread Michael Hertling
On 07/29/2011 06:22 PM, Louis Hoefler wrote:
 I tried that and now I get
 for the debug libraries:
 ...;wtdwthttpd.lib;...
 for the release libraries:
 ...;wtwthttp.lib;...
 
 I want it to look like
 ...;wt.lib;wthttp.lib;... or ...;wtd.lib;wthttpd.lib;...
 my version somehow adds one release
 library to the debug configuration and
 vice versa (...;wthttpd.lib;wt.lib;wthttp.lib;...).
 
 Sorry for not mentioning this.
 Thank you, Louis
 
 Am 29.07.2011 18:12, schrieb David Cole:
 Don't put a space in between the wt and the ${BACKENDLIB} ... ?

 Use this instead:

 IF(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt
debug wtd${BACKENDLIB}d
optimized wt${BACKENDLIB})
 ELSE(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt wt${BACKENDLIB})
 ENDIF(WIN32)

 Just a guess since I don't really know what you're expecting...


 On Fri, Jul 29, 2011 at 12:02 PM, Louis Hoeflerlouis.hoef...@gmx.de  wrote:
 Hello everyone.
 I try to set a specific library for the debug and release configuration.

 I try to do it this way:
 IF(DEFINED USEFCGI)
   SET(BACKENDLIB wtfcgi)
 ELSE(DEFINED USEFCGI)
   SET(BACKENDLIB wthttp)
 ENDIF(DEFINED USEFCGI)

 IF(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt
   debug wtd ${BACKENDLIB}d
   optimized wt ${BACKENDLIB})
 ELSE(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt wt ${BACKENDLIB})
 ENDIF(WIN32)

TARGET_LINK_LIBRARIES()'s debug/optimized/general keywords apply to
their following argument only: 'A debug, optimized, or general
keyword indicates that the library immediately following it is to be
used only for the corresponding build configuration.' [Documentation
of TARGET_LINK_LIBRARIES()]. So, your use of TARGET_LINK_LIBRARIES()
yields exactly what's expected/documented. Instead, it should read:

TARGET_LINK_LIBRARIES(construction.wt
debug wtd debug ${BACKENDLIB}d
optimized wt optimized ${BACKENDLIB})

However, you should definitely prefer the more powerful approach of
imported targets that is mainly intended for such linking concerns:

ADD_LIBRARY(wt SHARED IMPORTED)
ADD_LIBRARY(backendlib SHARED IMPORTED)
SET_TARGET_PROPERTIES(wt PROPERTIES
IMPORTED_LOCATION_DEBUG wtd
IMPORTED_LOCATION wt)
SET_TARGET_PROPERTIES(backendlib PROPERTIES
IMPORTED_LOCATION_DEBUG ${BACKENDLIB}d
IMPORTED_LOCATION ${BACKEND})
TARGET_LINK_LIBRARIES(construction.wt wt backendlib)

Regards,

Michael
___
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] TARGET_LINK_LIBRARIES debug optimized visual studio 2010

2011-07-29 Thread Michael Hertling
On 07/30/2011 12:06 AM, Michael Hertling wrote:
 On 07/29/2011 06:22 PM, Louis Hoefler wrote:
 I tried that and now I get
 for the debug libraries:
 ...;wtdwthttpd.lib;...
 for the release libraries:
 ...;wtwthttp.lib;...

 I want it to look like
 ...;wt.lib;wthttp.lib;... or ...;wtd.lib;wthttpd.lib;...
 my version somehow adds one release
 library to the debug configuration and
 vice versa (...;wthttpd.lib;wt.lib;wthttp.lib;...).

 Sorry for not mentioning this.
 Thank you, Louis

 Am 29.07.2011 18:12, schrieb David Cole:
 Don't put a space in between the wt and the ${BACKENDLIB} ... ?

 Use this instead:

 IF(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt
debug wtd${BACKENDLIB}d
optimized wt${BACKENDLIB})
 ELSE(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt wt${BACKENDLIB})
 ENDIF(WIN32)

 Just a guess since I don't really know what you're expecting...


 On Fri, Jul 29, 2011 at 12:02 PM, Louis Hoeflerlouis.hoef...@gmx.de  
 wrote:
 Hello everyone.
 I try to set a specific library for the debug and release configuration.

 I try to do it this way:
 IF(DEFINED USEFCGI)
   SET(BACKENDLIB wtfcgi)
 ELSE(DEFINED USEFCGI)
   SET(BACKENDLIB wthttp)
 ENDIF(DEFINED USEFCGI)

 IF(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt
   debug wtd ${BACKENDLIB}d
   optimized wt ${BACKENDLIB})
 ELSE(WIN32)
   TARGET_LINK_LIBRARIES(construction.wt wt ${BACKENDLIB})
 ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES()'s debug/optimized/general keywords apply to
 their following argument only: 'A debug, optimized, or general
 keyword indicates that the library immediately following it is to be
 used only for the corresponding build configuration.' [Documentation
 of TARGET_LINK_LIBRARIES()]. So, your use of TARGET_LINK_LIBRARIES()
 yields exactly what's expected/documented. Instead, it should read:
 
 TARGET_LINK_LIBRARIES(construction.wt
 debug wtd debug ${BACKENDLIB}d
 optimized wt optimized ${BACKENDLIB})
 
 However, you should definitely prefer the more powerful approach of
 imported targets that is mainly intended for such linking concerns:
 
 ADD_LIBRARY(wt SHARED IMPORTED)
 ADD_LIBRARY(backendlib SHARED IMPORTED)
 SET_TARGET_PROPERTIES(wt PROPERTIES
 IMPORTED_LOCATION_DEBUG wtd
 IMPORTED_LOCATION wt)
 SET_TARGET_PROPERTIES(backendlib PROPERTIES
 IMPORTED_LOCATION_DEBUG ${BACKENDLIB}d
 IMPORTED_LOCATION ${BACKEND})

Oops, IMPORTED_LOCATION ${BACKENDLIB}, of course.
  ^^^
 TARGET_LINK_LIBRARIES(construction.wt wt backendlib)
 
 Regards,
 
 Michael
___
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] Install files quietly

2011-07-29 Thread Michael Hertling
On 07/29/2011 11:43 AM, Mathias Tausig wrote:
 Hello!
 
 During the installation process, I am copying a quite large directory using
 INSTALL(DIRECTORY foo DESTINATION bar)
 
 When I run make install, every single file contained in foo is displayed
 in the shell. Is there some way to prevent a install command from
 printing to the command line?
 
 regards
 Mathias

AFAIK, the status message you complain about is hard-coded in the
FILE(INSTALL ...) command which is used in the cmake_install.cmake
script: The INSTALL signature differs slightly from COPY: it prints
status messages, ... [Documentation of FILE()]. So, the best you can
probably do is to use a suitable regex suppressing the unwanted output:

make install | grep -v '^-- '

Regards,

Michael
___
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] LIBRARY_OUTPUT_PATH for Dynamic and Static Libraries

2011-07-29 Thread Michael Hertling
On 07/28/2011 06:21 PM, Eric Noulard wrote:
 2011/7/28 Julien Dardenne julien.darde...@technooliq.com

 Hi,

 I compile my libraries into dynamic and static.
 I now wish to change the library path. If I am in static (folder : lib ) and 
 dynamic (folder : dll).

 For now, i have this script :

 OPTION (BUILD_SHARED_LIBS Build shared libraries with Games. OFF)

 IF (BUILD_SHARED_LIBS)
 SET (LIBRARY_OUTPUT_PATH)
 SET ($ {LIBRARY_OUTPUT_PATHPROJECT_BINARY_DIR} / dll / $ 
 {CACHE}CMAKE_BUILD_TYPE PATH Single outputdirectory for building all 
 libraries.)
 ELSE ()
 SET (LIBRARY_OUTPUT_PATH)
 SET ($ {LIBRARY_OUTPUT_PATHPROJECT_BINARY_DIR} / lib / $ 
 {CACHE}CMAKE_BUILD_TYPE PATH Single outputdirectory for building all 
 libraries.)
 ENDIF ()

 but my variable LIBRARY_OUTPUT_PATH does not change.

 Do you have an idea about this problem ?
 
 Your CMakeLists.txt syntax is weird.
 Is there any copy/paste trouble or did you literally wrote:
 
 SET (${LIBRARY_OUTPUT_PATHPROJECT_BINARY_DIR} / dl l/ ${CACHE} 
 CMAKE_BUILD_TYPE
  PATH
 Single outputdirectory for building all libraries.)
 
 If you wrote this I cannot see how this could work.
 I would expect something like
 
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/dll)
 
 and if it should go in CACHE add CACHE type comment.

Julien, besides the strange notation, keep in mind that

(1) LIBRARY_OUTPUT_PATH is obsolete, use the CMAKE_{ARCHIVE,
LIBRARY,RUNTIME}_OUTPUT_DIRECTORY variables instead, and
(2) on DLL platforms aka Windows, DLLs are classified as run-
time targets, i.e. the RUNTIME variables/properties apply.

Regards,

Michael
___
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] Bug fix requests for the *next* release of CMake...

2011-07-29 Thread Alan W. Irwin

Please do a fundamental fix for http://public.kitware.com/Bug/view.php?id=9220.

Alan


__
Alan W. Irwin

Astronomical research affiliation with Department of Physics and Astronomy,
University of Victoria (astrowww.phys.uvic.ca).

Programming affiliations with the FreeEOS equation-of-state implementation
for stellar interiors (freeeos.sf.net); PLplot scientific plotting software
package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of
Linux Links project (loll.sf.net); and the Linux Brochure Project
(lbproject.sf.net).
__

Linux-powered Science
__
___
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] Bug fix requests for the *next* release of CMake...

2011-07-29 Thread Alan W. Irwin

http://public.kitware.com/Bug/view.php?id=12301
___
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] Invalid library output directory when VC++ solution is generated

2011-07-29 Thread Michael Hertling
On 07/27/2011 01:03 PM, Laura Autón García wrote:
 Hello glenn,
 Thank you for your answer.
 I misunderstood the documentation. Thank you for pointing this out!
 
 Documentation:
 ...For DLL platforms the DLL part of a shared library is treated as a
 runtime target and the corresponding import library is treated as an
 archive target...
 
 It's a pity, because our intention was to keep in Windows, the way
 this is done in Linux, I mean, libraries (either shared or not) in
 ../lib directory and executables in ../bin directory. Right now, with
 no other ideas than the one provided by Alan in his previous reply,
 there seems to be no simple way to separate DLL files from binaries
 ones. It works perfectly using deprecated options:
 
   SET(EXECUTABLE_OUTPUT_PATH  ${BIN_DIR} CACHE PATH Directory for 
 executables)  
   SET(LIBRARY_OUTPUT_PATH ${LIB_DIR} CACHE PATH 
 Directory for executables)
 
 I understand this is not desirable, so we will have to make a choice
 between using deprecated properties while we try to figure out other
 way, or moving to the new way.

Just a few remarks:

(1) As Glenn has already mentioned, you might set the RUNTIME_OUTPUT_
DIRECTORY target property on your DLL targets to force them being
placed in ../lib - you should prefer absolute paths like ${CMAKE_
BINARY_DIR}/lib here - so you *can* achieve what you intend.

(2) DLLs are placed in the same directories as executables because in
this manner, they're found automatically when the executables are run.
Otherwise, i.e. with DLLs in different directories, you would have to
provide a hint where to search them, e.g. via the path. Regarding the
possibility to run executables from within the build tree - think of
testing - CMake's habit to place DLLs and executables next to each
other is highly reasonable. Note that this is no issue on *nix as
the mechanism for finding shared libraries is usually different.

(3) The MS tools do not refer to the DLL for linking - they refer to
the accompanying import library placed in the archive directory - so
the DLLs do not need to be written to a specific directory to build
executables but may reside wherever it's advantageous. However, the
GNU linker, i.e. MinGW, is able to link against DLLs immediately.

(4) If you want to place the DLLs in a lib directory during the final
installation, just use a separate INSTALL() command for them with a
RUNTIME DESTINATION lib whereas executables have an INSTALL() with
a RUNTIME DESTINATION bin, or do you depend on a certain directory
layout within the build tree?

Regards,

Michael

 2011/7/26 Glenn Coombs glenn.coo...@gmail.com:
 Have a look at the documentation for CMAKE_RUNTIME_OUTPUT_DIRECTORY.  On
 Linux the .so shared library files do go in the LIBRARY_OUTPUT_DIRECTORY.
 However, on Windows the DLL files are placed in the runtime directory and
 only the import libraries (.LIB files) are placed in the
 LIBRARY_OUTPUT_DIRECTORY.

 2011/7/25 Laura Autón García laura.au...@gmail.com

 Hello all,
 In the project I am collaborating on, CMake is used in Windows in
 order to generate a Visual C++ solution to be compiled afterwards. In
 this process, everything seems to work fine as the external
 directories and libraries are well included and everything compiles
 and so. However, we are experiencing problems with the directory in
 which our dll library is to be created.
 We specify in CMake that the directory is ../lib but
 when checking the configuration in Visual C++ software, it seems to be
 ../bin/Release directory, so the library is generated there.
 The CMake sentences we wrote regarding this issue are as follows:

  SET(LIB_DIR  ${PROJECT_SOURCE_DIR}/lib)
  SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DIR} CACHE PATH Directory
 for libraries)

 According to the documentation:

  CMAKE_LIBRARY_OUTPUT_DIRECTORY: Where to put all the LIBRARY
 targets when built.
  This variable is used to initialize the LIBRARY_OUTPUT_DIRECTORY
 property on all the targets.
  See that target property for additional information.

 Also, the documentation regarding LIBRARY_OUTPUT_DIRECTORY shows:

  LIBRARY_OUTPUT_DIRECTORY: Output directory in which to build
 LIBRARY target files.
  This property specifies the directory into which library target
 files should be built. There are three
  kinds of target files that may be built: archive, library, and
 runtime. Executables are always treated
  as runtime targets. Static libraries are always treated as archive
 targets. Module libraries are always
  treated as library targets. For non-DLL platforms shared libraries
 are treated as library targets. For
  DLL platforms the DLL part of a shared library is treated as a
 runtime target and the corresponding
  import library is treated as an archive target. All Windows-based
 systems including Cygwin are
  DLL platforms. This property is initialized by the value of the variable
  CMAKE_LIBRARY_OUTPUT_DIRECTORY if it is set when a target is created.

 

Re: [CMake] Linking problem

2011-07-29 Thread Michael Hertling
On 07/27/2011 01:14 PM, Sanatan Rai wrote:
 Hi,
This is a newbie question. So apologies in advance if this is covered
 somewhere in the docs (I haven't been able to find a satisfactory 
 explanation).
 
 The issue is this:
 
 * I have a library called (lib)atmath as per:
 
 include_directories(${at_SOURCE_DIR})
 add_library(atfwmath RngStream.cpp RngStream.h coin.cpp coin.hpp)
 target_link_libraries(atfwmath)
 
 Where coin.hpp:
 
 #ifndef COIN_HPP_INCLUDED
 #define COIN_HPP_INCLUDED
 
 #include sstream
 #include fw/math/RngStream.h
 using namespace std;
 
 class coin
 {
 private:
   static string name()
   {
 static unsigned long id(0);
 stringstream str;
 str  Coin_  (++id)  _stream;
 return str.str();
   }
   double p;
   RngStream *rng;
   void init();
 public:
   coin();
   coin(double _p);
   ~coin();
   bool toss();
   void reset(double _p);
 };
 #endif
 
 and coin.cpp:
 
 #include fw/math/coin.hpp
 
 coin::coin() : p(0.5), rng(0) { init();}
 coin::coin(double _p) : p(_p), rng(0)
 {
   if ((p  0) || (p  1))
 throw;
   init();
 }
 coin::~coin()
 {
   delete rng, rng = 0;
 }
 void coin::init()
 {
   rng = new RngStream(name().c_str());
 }
 bool coin::toss()
 {
   double u(rng-RandU01());
   return (u = p);
 }
 void coin::reset(double _p)
 {
   if ((_p  0) || (_p  1)) throw;
   p = _p;
 }
 
 
 I use these classes in another library:
 
 add_library(atidt STATIC idt.cpp)
 target_link_libraries(atidt atmath boost_date_time boost_signals)
 
 
 which is then linked to the final executable:
 add_executable(bt bt.cpp)
 target_link_libraries(bt atidt atmath boost_date_time boost_program_options)
 target_link_libraries(bt -Wl,-whole-archive -L../idt/ -latidt
 -Wl,-no-whole-archive)
 
 When I run make:
 
* libatmath compiles fine.
* libatidt complies fine.
* when compiling bt, it complains about coin::coin, coin::reset etc
 being undefined.
  Ie it would see it is not finding them in the linked libraries.
 Even though:
 
  $ ar t libatmath.a
   RngStream.cpp.o
   coin.cpp.o
 
 What am I missing here? It is also quite bizarre as it doesn't
 complain about the declarations in
 RngStream.h which are defined in RngStream.c.
 
 Thanks in advance!
 
 --Sanatan

AFAICS, the problem arises from bt's TARGET_LINK_LIBRARIES() commands:

target_link_libraries(bt atidt atmath ...)
target_link_libraries(bt -Wl,-whole-archive -L../idt/ -latidt
-Wl,-no-whole-archive)

In this way, -latidt appears at last in the linker command line without
a chance for CMake to mention atmath afterwards, but the former depends
on the latter as can be concluded from atidt's TARGET_LINK_LIBRARIES()
command. Finally, the whole-archive switch forces the linker to include
every object file - regardless if it is referred to or not - so atidt's
references to atmath can not be resolved. What do you intend with this
second TARGET_LINK_LIBRARIES() command? To me, it does not make much
sense at the first glance. Moreover:

(1) Since you force all object files from atidt to be included in the
final executable, you might also get errors from multiple definitions
as the executable is linked against atidt once before.

(2) Don't use using namespace std; at the global scope in a header.

'hope that helps.

Regards,

Michael
___
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] Problem with regular expression

2011-07-29 Thread Michael Hertling
On 07/15/2011 10:10 AM, Sven Klomp wrote:
 Hi,
 
 I'm using cmake 2.8.3 and have a problem using regular expressions:
 
 STRING(REGEX REPLACE
   ^(Input:[0-9]+:)([^/].*)$
   _Start_\\1_Middle_\\2_End_
   TESTVARIABLE
   Input:1:filename1 \nInput:104:filename2 \n
   )
 MESSAGE(${TESTVARIABLE})
 
 The expected output is:
 _Start_Input:1:_Middle_filename1_End_
 _Start_Input:104:_Middle_filename2_End_
 
 However, the actual output is:
 _Start_Input:1:_Middle_filename1
 Input:104:filename2
 _End_
 
 It seems that . matches also the newline, altough
 http://www.cmake.org/cmake/help/syntax.html
 says ist shouldn't!

Obviously, that's not true:

STRING(REGEX REPLACE . X VAR \n)
MESSAGE(VAR: ${VAR})

yields:

VAR: X

 How can I get the expected result?

STRING(REGEX REPLACE
  (Input:[0-9]+:)([^/][^\n]*)
  _Start_\\1_Middle_\\2_End_
  TESTVARIABLE
  Input:1:filename1 \nInput:104:filename2 \n
  )

Regards,

Michael
___
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.5-1332-ga355760

2011-07-29 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  a355760ad2c3f8ba4a0d606dd9e6093ca6aab665 (commit)
   via  37d8602cdee0bdef29f1886fc83f48569addcbd7 (commit)
   via  df9577259ca5a30f5c79baee038fe42e25b4a1e5 (commit)
  from  61df4ad584c7fe193628cd06f709b9008e77840d (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=a355760ad2c3f8ba4a0d606dd9e6093ca6aab665
commit a355760ad2c3f8ba4a0d606dd9e6093ca6aab665
Merge: 61df4ad 37d8602
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 10:22:45 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 10:22:45 2011 -0400

Merge topic 'fix-8707-add-vs-globals' into next

37d8602 Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
df95772 Add support for Visual Studio project-specific globals (#8707)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37d8602cdee0bdef29f1886fc83f48569addcbd7
commit 37d8602cdee0bdef29f1886fc83f48569addcbd7
Merge: df95772 6c72d25
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 10:22:33 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 10:22:33 2011 -0400

Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals

Conflicts:
Source/cmLocalVisualStudio7Generator.h

diff --cc Source/cmLocalVisualStudio7Generator.h
index 4fdbc58,8f7c7eb..35f659f
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@@ -84,8 -86,7 +86,7 @@@ private
void WriteProjectFiles();
void WriteVCProjHeader(std::ostream fout, const char *libName,
   cmTarget tgt, std::vectorcmSourceGroup sgs);
 -  void WriteVCProjFooter(std::ostream fout);
 +  void WriteVCProjFooter(std::ostream fout, cmTarget target);
-   void CreateSingleVCProj(const char *lname, cmTarget tgt);
void WriteVCProjFile(std::ostream fout, const char *libName, 
 cmTarget tgt);
void WriteConfigurations(std::ostream fout,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df9577259ca5a30f5c79baee038fe42e25b4a1e5
commit df9577259ca5a30f5c79baee038fe42e25b4a1e5
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 10:04:36 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 10:04:36 2011 -0400

Add support for Visual Studio project-specific globals (#8707)

Thanks to Pau Garcia i Quiles for the inspiration for the patch.
I've tweaked it a bit compared to what's in the bug tracker: this
commit does not allow empty global variable names.

I also added usage of the new feature to an existing test. Although
it has no effect on the resulting Visual Studio projects, you can
verify that the VSResource test produces a non-empty globals section
in the generated .vcproj(x) files.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx 
b/Source/cmLocalVisualStudio7Generator.cxx
index 7a62b9c..3e76f59 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1279,7 +1279,7 @@ void 
cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream fout,
   fout  \t/Files\n;
 
   // Write the VCProj file's footer.
-  this-WriteVCProjFooter(fout);
+  this-WriteVCProjFooter(fout, target);
 }
 
 struct cmLVS7GFileConfig
@@ -1880,10 +1880,28 @@ 
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream fout,
 }
 
 
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream fout)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream fout,
+  cmTarget target)
 {
-  fout  \tGlobals\n
-\t/Globals\n
+  fout  \tGlobals\n;
+
+  cmPropertyMap const props = target.GetProperties();
+  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+{
+if(i-first.find(VS_GLOBAL_) == 0)
+  {
+  std::string name = i-first.substr(10);
+  if(name != )
+{
+fout  \t\tGlobal\n
+  \t\t\tName=\  name  \\n
+  \t\t\tValue=\  i-second.GetValue()  \\n
+  \t\t/\n;
+}
+  }
+}
+
+  fout  \t/Globals\n
 /VisualStudioProject\n;
 }
 
diff --git a/Source/cmLocalVisualStudio7Generator.h 
b/Source/cmLocalVisualStudio7Generator.h
index 160e2d4..4fdbc58 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -84,7 +84,7 @@ private:
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream fout, const char *libName,
  

[Cmake-commits] CMake branch, next, updated. v2.8.5-1334-g6e445fc

2011-07-29 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  6e445fce2dc0c882f9b8a584e5b870c063311544 (commit)
   via  0375865a4e1ab337ae5ac2e8eae888444da00864 (commit)
  from  a355760ad2c3f8ba4a0d606dd9e6093ca6aab665 (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=6e445fce2dc0c882f9b8a584e5b870c063311544
commit 6e445fce2dc0c882f9b8a584e5b870c063311544
Merge: a355760 0375865
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 10:32:12 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 10:32:12 2011 -0400

Merge topic 'fix-updategit-test' into next

0375865 Fix machine-specific UpdateGIT test failures


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0375865a4e1ab337ae5ac2e8eae888444da00864
commit 0375865a4e1ab337ae5ac2e8eae888444da00864
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 10:24:06 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 10:24:06 2011 -0400

Fix machine-specific UpdateGIT test failures

Generated Update.xml file is larger than the previously
hard-coded limit of 4096. Introduce variable max_update_xml_size
and bump it up to 16k for reliable test runs.

diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake
index a52cb14..335d09e 100644
--- a/Tests/CTestUpdateCommon.cmake
+++ b/Tests/CTestUpdateCommon.cmake
@@ -29,11 +29,13 @@ function(check_updates build)
   endif(NOT UPDATE_XML_FILE)
   message( found ${UPDATE_XML_FILE})
 
+  set(max_update_xml_size 16384)
+
   # Read entries from the Update.xml file
   set(types Updated|Modified|Conflicting)
   file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_ENTRIES
 REGEX (${types}|FullName)
-LIMIT_INPUT 4096
+LIMIT_INPUT ${max_update_xml_size}
 )
   string(REGEX REPLACE
 [ \t]*(${types})[ \t]*;[ \t]*FullName([^]*)/FullName
@@ -51,7 +53,7 @@ function(check_updates build)
 set(rev_regex ^\t(${rev_regex})[^\n]+/(${rev_regex})$)
 file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_REVISIONS
   REGEX ${rev_regex}
-  LIMIT_INPUT 4096
+  LIMIT_INPUT ${max_update_xml_size}
   )
 foreach(r IN LISTS UPDATE_XML_REVISIONS)
   string(REGEX REPLACE ${rev_regex} \\1 element ${r})
@@ -94,7 +96,7 @@ function(check_updates build)
 file(GLOB UPDATE_LOG_FILE
   ${TOP}/${build}/Testing/Temporary/LastUpdate*.log)
 if(UPDATE_LOG_FILE)
-  file(READ ${UPDATE_LOG_FILE} UPDATE_LOG LIMIT 4096)
+  file(READ ${UPDATE_LOG_FILE} UPDATE_LOG LIMIT ${max_update_xml_size})
   string(REGEX REPLACE \n \n   UPDATE_LOG ${UPDATE_LOG})
   set(MSG ${MSG}Update log:\n  ${UPDATE_LOG})
 else(UPDATE_LOG_FILE)

---

Summary of changes:
 Tests/CTestUpdateCommon.cmake |8 +---
 1 files changed, 5 insertions(+), 3 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.5-1337-g9371ff1

2011-07-29 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  9371ff19cfb91eb3b284f6d5c06f2783e410d174 (commit)
   via  0baf5659c6222175b5d0a5b47d45e145dbdb8400 (commit)
   via  5ef20b2dc54474ceba1c81a75e8c3fc558d505fa (commit)
  from  6e445fce2dc0c882f9b8a584e5b870c063311544 (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=9371ff19cfb91eb3b284f6d5c06f2783e410d174
commit 9371ff19cfb91eb3b284f6d5c06f2783e410d174
Merge: 6e445fc 0baf565
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 11:31:51 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 11:31:51 2011 -0400

Merge topic 'adjust-path-for-all-generators-test' into next

0baf565 Ensure libgmp-10.dll is in the PATH for CMakeTestAllGenerators
5ef20b2 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0baf5659c6222175b5d0a5b47d45e145dbdb8400
commit 0baf5659c6222175b5d0a5b47d45e145dbdb8400
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 11:04:48 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 11:13:33 2011 -0400

Ensure libgmp-10.dll is in the PATH for CMakeTestAllGenerators

But only if it exists at the default location:
C:/MinGW/bin/libgmp-10.dll

This is so that the pop-up dialog about not being able to load
that dll does not hang the test when there's nobody watching.

diff --git a/Tests/CMakeTestAllGenerators/RunCMake.cmake 
b/Tests/CMakeTestAllGenerators/RunCMake.cmake
index dcf4a23..6d27d3b 100644
--- a/Tests/CMakeTestAllGenerators/RunCMake.cmake
+++ b/Tests/CMakeTestAllGenerators/RunCMake.cmake
@@ -60,6 +60,28 @@ message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of 
output))
 
 message(STATUS CMake generators='${generators}')
 
+# If we'll be testing any of the MinGW Makefiles generators, adjust the
+# ENV{PATH} to make sure libgmp-10.dll can be loaded as needed. But only if
+# the testing machine has a default MinGW install... (If you have a
+# non-default install, append to the PATH before running the test...)
+#
+if(generators MATCHES MinGW Makefiles)
+  if(EXISTS C:/MinGW/bin/libgmp-10.dll)
+string(TOLOWER $ENV{PATH} path)
+if(NOT path MATCHES /mingw/bin)
+  if(UNIX)
+set(sep :)
+set(mingw_bin /mingw/bin)
+  else()
+set(sep ;)
+set(mingw_bin C:/MinGW/bin)
+  endif()
+  set(ENV{PATH} $ENV{PATH}${sep}${mingw_bin})
+  message(STATUS info: appending '${sep}${mingw_bin}' to the PATH)
+endif()
+  endif()
+endif()
+
 # First setup a source tree to run CMake on.
 #
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory

---

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake   |2 +-
 Tests/CMakeTestAllGenerators/RunCMake.cmake |   22 ++
 2 files changed, 23 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.5-1339-g72860ee

2011-07-29 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  72860eecf54bbe60b5490f67e6714c1e98dfcdb4 (commit)
   via  80769cdd1e568c1dbc66651557d98bba0f70ea00 (commit)
  from  9371ff19cfb91eb3b284f6d5c06f2783e410d174 (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=72860eecf54bbe60b5490f67e6714c1e98dfcdb4
commit 72860eecf54bbe60b5490f67e6714c1e98dfcdb4
Merge: 9371ff1 80769cd
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 13:48:02 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 13:48:02 2011 -0400

Merge topic 'fix-11866-add-watcom-sys-libs' into next

80769cd Add Watcom support to InstallRequiredSystemLibraries (#11866)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80769cdd1e568c1dbc66651557d98bba0f70ea00
commit 80769cdd1e568c1dbc66651557d98bba0f70ea00
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 13:28:54 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 13:28:54 2011 -0400

Add Watcom support to InstallRequiredSystemLibraries (#11866)

Also adds code to determine the version of the Watcom compiler
in use.

Thanks to J Decker for the patch.

diff --git a/Modules/CMakeTestWatcomVersion.c b/Modules/CMakeTestWatcomVersion.c
new file mode 100644
index 000..0343fb1
--- /dev/null
+++ b/Modules/CMakeTestWatcomVersion.c
@@ -0,0 +1 @@
+VERSION=__WATCOMC__
diff --git a/Modules/InstallRequiredSystemLibraries.cmake 
b/Modules/InstallRequiredSystemLibraries.cmake
index 59e5ec1..b6735c1 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -330,6 +330,40 @@ IF(MSVC)
   ENDFOREACH(lib)
 ENDIF(MSVC)
 
+IF(WATCOM)
+  GET_FILENAME_COMPONENT( CompilerPath ${CMAKE_C_COMPILER} PATH )
+  IF(WATCOM17)
+ SET( __install__libs ${CompilerPath}/clbr17.dll
+   ${CompilerPath}/mt7r17.dll ${CompilerPath}/plbr17.dll )
+  ENDIF()
+  IF(WATCOM18)
+ SET( __install__libs ${CompilerPath}/clbr18.dll
+   ${CompilerPath}/mt7r18.dll ${CompilerPath}/plbr18.dll )
+  ENDIF()
+  IF(WATCOM19)
+ SET( __install__libs ${CompilerPath}/clbr19.dll
+   ${CompilerPath}/mt7r19.dll ${CompilerPath}/plbr19.dll )
+  ENDIF()
+  FOREACH(lib
+  ${__install__libs}
+  )
+IF(EXISTS ${lib})
+  SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
+${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
+ELSE()
+  IF(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+MESSAGE(WARNING system runtime library file does not exist: '${lib}')
+# This warning indicates an incomplete Watcom installation
+# or a bug somewhere above here in this file.
+# If you would like to avoid this warning, fix the real problem, or
+# set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS before including
+# this file.
+  ENDIF()
+ENDIF()
+  ENDFOREACH()
+ENDIF()
+
+
 # Include system runtime libraries in the installation if any are
 # specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS.
 IF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
diff --git a/Modules/Platform/Windows-wcl386.cmake 
b/Modules/Platform/Windows-wcl386.cmake
index e96ebb5..c10fd78 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -81,3 +81,41 @@ SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  wlib 
${CMAKE_LIB_QUIET} -n -b 'TARGET_UNQ
 
 # create a C static library
 SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
+
+IF(NOT CMAKE_WATCOM_COMPILER_TESTS_RUN)
+  SET(CMAKE_WATCOM_COMPILER_TESTS_RUN 1)
+  SET(testWatcomVersionFile
+${CMAKE_ROOT}/Modules/CMakeTestWatcomVersion.c)
+  STRING(REGEX REPLACE /  testWatcomVersionFile 
${testWatcomVersionFile})
+  MESSAGE(STATUS Check for Watcom compiler version)
+  SET(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER})
+  IF (NOT CMAKE_C_COMPILER)
+SET(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER})
+  ENDIF()
+  EXECUTE_PROCESS(COMMAND ${CMAKE_TEST_COMPILER}
+-q -pc \${testWatcomVersionFile}\
+OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
+RETURN_VALUE CMAKE_COMPILER_RETURN
+)
+  STRING(REGEX REPLACE \n   compilerVersion ${CMAKE_COMPILER_OUTPUT})
+  STRING(REGEX REPLACE .*VERSION=(.*) \\1
+compilerVersion ${compilerVersion})
+  IF(NOT CMAKE_COMPILER_RETURN)
+SET(WATCOM16)
+SET(WATCOM17)
+SET(WATCOM18)
+SET(WATCOM19)
+IF(${compilerVersion} LESS 1270)
+  SET(WATCOM16 1)
+ENDIF()
+IF(${compilerVersion} EQUAL 1270)
+  SET(WATCOM17 1)
+ENDIF()
+IF(${compilerVersion} EQUAL 1280)
+  SET(WATCOM18 1)
+ENDIF()
+ 

[Cmake-commits] CMake branch, next, updated. v2.8.5-1341-gcbd8aca

2011-07-29 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  cbd8aca5c680925359fb953287fbace472a4e3cb (commit)
   via  a0974ae2e69052e343764ddb93749739b7674977 (commit)
  from  72860eecf54bbe60b5490f67e6714c1e98dfcdb4 (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=cbd8aca5c680925359fb953287fbace472a4e3cb
commit cbd8aca5c680925359fb953287fbace472a4e3cb
Merge: 72860ee a0974ae
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 13:59:02 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 13:59:02 2011 -0400

Merge topic 'fix-12245-add-wlib--c-flag' into next

a0974ae Watcom: Add -c flag to wlib calls (#12245)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0974ae2e69052e343764ddb93749739b7674977
commit a0974ae2e69052e343764ddb93749739b7674977
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 13:52:23 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 13:52:23 2011 -0400

Watcom: Add -c flag to wlib calls (#12245)

Allows wlib to generate proper exports if two routines have
the same spelling, but different case (like Scale and scale).

Thanks to J Decker for the patch.

diff --git a/Modules/Platform/Windows-wcl386.cmake 
b/Modules/Platform/Windows-wcl386.cmake
index e96ebb5..f184e23 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -39,7 +39,7 @@ SET (CMAKE_C_STANDARD_LIBRARIES_INIT library clbrdll.lib 
library plbrdll.lib  l
 SET (CMAKE_CXX_STANDARD_LIBRARIES_INIT ${CMAKE_C_STANDARD_LIBRARIES_INIT})
 
 SET(CMAKE_C_CREATE_IMPORT_LIBRARY
-  wlib -q -n -b TARGET_IMPLIB +'TARGET_UNQUOTED')
+  wlib -c -q -n -b TARGET_IMPLIB +'TARGET_UNQUOTED')
 SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
 
 SET(CMAKE_C_LINK_EXECUTABLE
@@ -77,7 +77,7 @@ SET(CMAKE_C_CREATE_SHARED_LIBRARY 
${CMAKE_CXX_CREATE_SHARED_LIBRARY})
 SET(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_MODULE})
 
 # create a C++ static library
-SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  wlib ${CMAKE_LIB_QUIET} -n -b 
'TARGET_UNQUOTED' LINK_FLAGS OBJECTS )
+SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  wlib ${CMAKE_LIB_QUIET} -c -n -b 
'TARGET_UNQUOTED' LINK_FLAGS OBJECTS )
 
 # create a C static library
 SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})

---

Summary of changes:
 Modules/Platform/Windows-wcl386.cmake |4 ++--
 1 files changed, 2 insertions(+), 2 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.5-1343-gff049a3

2011-07-29 Thread Clinton Stimpson
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  ff049a3e8ed0ad4dbc79bc647b9a35f7fa914eea (commit)
   via  e6d2bcfde2c0cd254ce1461e368ff79eb0010473 (commit)
  from  cbd8aca5c680925359fb953287fbace472a4e3cb (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=ff049a3e8ed0ad4dbc79bc647b9a35f7fa914eea
commit ff049a3e8ed0ad4dbc79bc647b9a35f7fa914eea
Merge: cbd8aca e6d2bcf
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Jul 29 14:24:02 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 14:24:02 2011 -0400

Merge topic 'cpack-nsis-multi-installs' into next

e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using 
components.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6d2bcfde2c0cd254ce1461e368ff79eb0010473
commit e6d2bcfde2c0cd254ce1461e368ff79eb0010473
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Jul 29 12:23:22 2011 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Jul 29 12:23:22 2011 -0600

CPack/NSIS: Fix reinstall and multiple install issues when using components.

Fix NSIS template to more thoroughly use CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
This allows different versions of software to have a separate sections in 
the
registry to keep track of things (installed components, and uninstall 
stuff).

Change default of CPACK_PACKAGE_INSTALL_REGISTRY_KEY to follow the value of
CPACK_PACKAGE_INSTALL_DIRECTORY so if an installation overwrites another 
installation,
the proper registry entries are more likely to be overwritten.

Fix CPack/NSIS generator to not insert code in the NSIS template to skip 
installation
of already installed components.  This enables a repair like behavior and 
also enables
installing patch releases on top of an older installation.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index bf52b25..d82de93 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -322,7 +322,7 @@ cpack_set_if_not_set(CPACK_PACKAGE_FILE_NAME
 cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_DIRECTORY
   ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION})
 cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
-  ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION})
+  ${CPACK_PACKAGE_INSTALL_DIRECTORY})
 cpack_set_if_not_set(CPACK_PACKAGE_DEFAULT_LOCATION /)
 cpack_set_if_not_set(CPACK_PACKAGE_RELOCATABLE true)
 
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index df9d2d3..6259a5b 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -74,7 +74,7 @@ Var AR_RegFlags

   ClearErrors
   ;Reading component status from registry
-  ReadRegDWORD $AR_RegFlags HKLM 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}
 Installed
+  ReadRegDWORD $AR_RegFlags HKLM 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}
 Installed
   IfErrors default_${SecName}
 ;Status will stay default if registry value not found
 ;(component was never installed)
@@ -107,13 +107,13 @@ Var AR_RegFlags
 ;Section is not selected:
 ;Calling Section uninstall macro and writing zero installed flag
 !insertmacro Remove_${${SecName}}
-WriteRegDWORD HKLM 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}
 \
+WriteRegDWORD HKLM 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}
 \
   Installed 0
 Goto exit_${SecName}
  
  leave_${SecName}:
 ;Section is selected:
-WriteRegDWORD HKLM 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}
 \
+WriteRegDWORD HKLM 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}
 \
   Installed 1
  
  exit_${SecName}:
@@ -493,7 +493,7 @@ Function ConditionalAddToRegisty
   Pop $0
   Pop $1
   StrCmp $0  ConditionalAddToRegisty_EmptyString
-WriteRegStr SHCTX 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ \
+WriteRegStr SHCTX 
Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@
 \
 $1 $0
 ;MessageBox MB_OK Set Registry: '$1' to '$0'
 DetailPrint Set install registry entry: '$1' to '$0'
@@ -804,17 +804,17 @@ FunctionEnd
 
 Section Uninstall
   ReadRegStr $START_MENU SHCTX \
-   Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ 
StartMenu
+   

[Cmake-commits] CMake branch, next, updated. v2.8.5-1345-g7bde5d7

2011-07-29 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  7bde5d734e10c285fda2e69dbdb20897d8549fec (commit)
   via  05ddfbfe95c4536521084975be6e9cadf0ee05f9 (commit)
  from  ff049a3e8ed0ad4dbc79bc647b9a35f7fa914eea (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=7bde5d734e10c285fda2e69dbdb20897d8549fec
commit 7bde5d734e10c285fda2e69dbdb20897d8549fec
Merge: ff049a3 05ddfbf
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Jul 29 14:50:04 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 14:50:04 2011 -0400

Merge topic 'fix-12299-add-vs10-scc-support' into next

05ddfbf VS10: Add SCC support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05ddfbfe95c4536521084975be6e9cadf0ee05f9
commit 05ddfbfe95c4536521084975be6e9cadf0ee05f9
Author: Steven Velez sbv1...@gmail.com
AuthorDate: Tue Jun 14 09:45:52 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Fri Jul 29 14:06:28 2011 -0400

VS10: Add SCC support

Honor the properties that were added for earlier versions
of visual studio.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index d710405..ac4296c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,8 +178,23 @@ void cmVisualStudio10TargetGenerator::Generate()
   this-WriteString(ProjectGUID, 2);
   (*this-BuildFileStream)   {  this-GUID  }/ProjectGUID\n;
 
-  this-WriteString(SccProjectName /\n, 2);
-  this-WriteString(SccLocalPath /\n, 2);
+  const char* vsProjectName = this-Target-GetProperty(VS_SCC_PROJECTNAME);
+  const char* vsLocalPath = this-Target-GetProperty(VS_SCC_LOCALPATH);
+  const char* vsProvider = this-Target-GetProperty(VS_SCC_PROVIDER);
+
+  if ( vsProjectName  vsLocalPath  vsProvider)
+{
+this-WriteString(SccProjectName, 2);
+(*this-BuildFileStream)  cmVS10EscapeXML(vsProjectName) 
+  /SccProjectName\n;
+this-WriteString(SccLocalPath, 2);
+(*this-BuildFileStream)  cmVS10EscapeXML(vsLocalPath) 
+  /SccLocalPath\n;
+this-WriteString(SccProvider, 2);
+(*this-BuildFileStream)  cmVS10EscapeXML(vsProvider) 
+  /SccProvider\n;
+}
+
   this-WriteString(KeywordWin32Proj/Keyword\n, 2);
   this-WriteString(Platform, 2);
   (*this-BuildFileStream)  this-Platform  /Platform\n;

---

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   19 +--
 1 files changed, 17 insertions(+), 2 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.5-1353-g2545186

2011-07-29 Thread Alexander Neundorf
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  25451865e6fe88c14d581a3d7f0b6fb6e046a2b9 (commit)
   via  b62349cc60d71eb2af5648eb6867678d5b05273b (commit)
   via  f366cf8a86a1e403b5922bb5bfa2488460f49201 (commit)
   via  f407bb5da29b36ca4edee93ff21ae2a5b8fda960 (commit)
   via  02d47abe58b4fa99f34b24cb799084e0f57215bd (commit)
   via  91a1527735c8d4f598a1836b1cc8ba128936712e (commit)
   via  0671a029205763845e5fd21ce5f69fbe8b0b2c45 (commit)
   via  aae13f4c8ea652f437b096b9017bd76ed62fd44d (commit)
  from  7bde5d734e10c285fda2e69dbdb20897d8549fec (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=25451865e6fe88c14d581a3d7f0b6fb6e046a2b9
commit 25451865e6fe88c14d581a3d7f0b6fb6e046a2b9
Merge: 7bde5d7 b62349c
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Fri Jul 29 16:34:02 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 16:34:02 2011 -0400

Merge topic 'FeatureSummaryImprovements' into next

b62349c FeatureSummary.cmake: update documentation
f366cf8 FeatureSummary.cmake: cosmetics
f407bb5 FeatureSummary.cmake: only higher TYPEs can override previous TYPEs
02d47ab FeatureSummary.cmake: error out when a REQUIRED package is missing
91a1527 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
0671a02 FeatureSummary.cmake: remove comment field
aae13f4 Extend FeatureSummary: add PURPOSE of package and TYPE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b62349cc60d71eb2af5648eb6867678d5b05273b
commit b62349cc60d71eb2af5648eb6867678d5b05273b
Author: Alex Neundorf neund...@kde.org
AuthorDate: Sun Jul 17 21:23:13 2011 +0200
Commit: Alex Neundorf neund...@kde.org
CommitDate: Sun Jul 17 21:23:13 2011 +0200

FeatureSummary.cmake: update documentation

Alex

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 2419633..570fb7b 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -1,18 +1,22 @@
 # - Macros for generating a summary of enabled/disabled features
 #
-# This module provides the macros feature_summary(), set_package_info() and
+# This module provides the macros feature_summary(), set_package_properties() 
and
 # add_feature_info().
-# For compatiblity it also still provides set_feature_info(),
-# print_enabled_features() and print_disabled_features.
+# For compatiblity it also still provides set_package_info(), 
set_feature_info(),
+# print_enabled_features() and print_disabled_features().
 #
 # These macros can be used to generate a summary of enabled and disabled
 # packages and/or feature for a build tree:
 #
-#-- Enabled features:
+#-- The following OPTIONAL packages have been found:
 #LibXml2 (required version = 2.4) , XML processing library. , 
http://xmlsoft.org
+#   * Enables HTML-import in MyWordProcessor
+#   * Enables odt-export in MyWordProcessor
 #PNG , A PNG image library. , http://www.libpng.org/pub/png/
-#-- Disabled features:
+#   * Enables saving screenshots
+#-- The following OPTIONAL packages have not been found:
 #Lua51 , The Lua scripting language. , http://www.lua.org
+#   * Enables macros in MyWordProcessor
 #Foo , Foo provides cool stuff.
 #
 #
@@ -20,24 +24,34 @@
 # [APPEND]
 # [VAR variable_name]
 # [INCLUDE_QUIET_PACKAGES]
+# [FATAL_ON_MISSING_REQUIRED_PACKAGES]
 # [DESCRIPTION Found packages:]
 # WHAT (ALL | PACKAGES_FOUND | PACKAGES_NOT_FOUND
 #  | ENABLED_FEATURES | DISABLED_FEATURES]
 #   )
 #
 # The FEATURE_SUMMARY() macro can be used to print information about enabled
-# or disabled features or packages of a project.
+# or disabled packages or features of a project.
 # By default, only the names of the features/packages will be printed and their
-# required version when one was specified. Use SET_FEATURE_INFO() to add more
-# useful information, like e.g. a download URL for the respective package.
+# required version when one was specified. Use SET_PACKAGE_PROPERTIES() to add 
more
+# useful information, like e.g. a download URL for the respective package or 
their
+# purpose in the project.
 #
 # The WHAT option is the only mandatory option. Here you specify what 
information
 # will be printed:
+#ALL: print everything
 #ENABLED_FEATURES: the list of all features which are enabled
 #DISABLED_FEATURES: the list of all features which are disabled
 #PACKAGES_FOUND: the 

[Cmake-commits] CMake branch, next, updated. v2.8.5-1355-gbb8ef43

2011-07-29 Thread Alexander Neundorf
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  bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca (commit)
   via  f32f6f0652b8b99abd2cf8558a193571e47e9217 (commit)
  from  25451865e6fe88c14d581a3d7f0b6fb6e046a2b9 (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=bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca
commit bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca
Merge: 2545186 f32f6f0
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Fri Jul 29 17:27:46 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 17:27:46 2011 -0400

Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject' into next

f32f6f0 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f32f6f0652b8b99abd2cf8558a193571e47e9217
commit f32f6f0652b8b99abd2cf8558a193571e47e9217
Author: Alex Neundorf neund...@kde.org
AuthorDate: Fri Jul 29 23:24:21 2011 +0200
Commit: Alex Neundorf neund...@kde.org
CommitDate: Fri Jul 29 23:24:21 2011 +0200

Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)

This causes that all files in C::B are displayed in a tree starting at /

Alex

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index 4f93067..28ea10a 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -266,10 +266,17 @@ void cmExtraCodeBlocksGenerator
   }
 
 // Convert
+const char* cmakeRoot = mf-GetDefinition(CMAKE_ROOT);
 for (std::vectorstd::string::const_iterator jt = listFiles.begin();
  jt != listFiles.end();
  ++jt)
   {
+  // don't put cmake's own files into the project (#12110):
+  if (jt-find(cmakeRoot) == 0)
+{
+continue;
+}
+
   const std::string relative = cmSystemTools::RelativePath(
  it-second[0]-GetMakefile()-GetHomeDirectory(),
  jt-c_str());

---

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |7 +++
 1 files changed, 7 insertions(+), 0 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.5-1357-g2b29b89

2011-07-29 Thread Alexander Neundorf
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  2b29b89590906034e3ddace24c8fe145cce8771d (commit)
   via  6b71bf88766ac968a389f2813f8f9244e3f561b4 (commit)
  from  bb8ef43a060a90d5e7f686c44a7ec5b5754b17ca (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=2b29b89590906034e3ddace24c8fe145cce8771d
commit 2b29b89590906034e3ddace24c8fe145cce8771d
Merge: bb8ef43 6b71bf8
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Fri Jul 29 17:30:34 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 29 17:30:34 2011 -0400

Merge topic 'RemoveDebugOutput' into next

6b71bf8 Remove debug output from CheckSymbolExists


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b71bf88766ac968a389f2813f8f9244e3f561b4
commit 6b71bf88766ac968a389f2813f8f9244e3f561b4
Author: Alex Neundorf neund...@kde.org
AuthorDate: Fri Jul 29 23:27:28 2011 +0200
Commit: Alex Neundorf neund...@kde.org
CommitDate: Fri Jul 29 23:27:28 2011 +0200

Remove debug output from CheckSymbolExists

...which shouldn't have been committed.

Alex

diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index a62aa70..be7d658 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -40,7 +40,6 @@ MACRO(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
 ENDMACRO(CHECK_SYMBOL_EXISTS)
 
 MACRO(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
-message(STATUS files: -${FILES}-)
   IF(${VARIABLE} MATCHES ^${VARIABLE}$)
 SET(CMAKE_CONFIGURABLE_FILE_CONTENT /* */\n)
 SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})

---

Summary of changes:


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, master, updated. v2.8.5-76-g5502245

2011-07-29 Thread KWSys Robot
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, master has been updated
   via  55022455d0470bf9175476730b43fe9283cb4283 (commit)
  from  5ef20b2dc54474ceba1c81a75e8c3fc558d505fa (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=55022455d0470bf9175476730b43fe9283cb4283
commit 55022455d0470bf9175476730b43fe9283cb4283
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Sat Jul 30 00:01:29 2011 -0400
Commit: KWSys Robot kwro...@kitware.com
CommitDate: Sat Jul 30 00:14:02 2011 -0400

KWSys Nightly Date Stamp

diff --git a/Source/kwsys/kwsysDateStamp.cmake 
b/Source/kwsys/kwsysDateStamp.cmake
index 9cc407c..0cbbf82 100644
--- a/Source/kwsys/kwsysDateStamp.cmake
+++ b/Source/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2011)
 SET(KWSYS_DATE_STAMP_MONTH 07)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   29)
+SET(KWSYS_DATE_STAMP_DAY   30)

---

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