[cmake-developers] Some dashboard warnings and errors

2012-05-21 Thread Eric Noulard
Hi all,

My merge of stage/CPack-activateRPM-DEB-onMacOS to next yesterday raised
some warning on this dashboard:
http://open.cdash.org/viewBuildError.php?type=1buildid=2293803

the warning are right, the static method call *is always true* but
shall I really try to avoid such warning?
The always true may become some day not always true but I wanted to have
CPackGeneratorFactory be coded in a uniform way.

What shall I do with that?

Then the same set of commits may be responsible for that:
http://open.cdash.org/buildSummary.php?buildid=2294180

but I can't find a reason for all 192 failing tests, can anyone enlight me?
The only thing I see is

[flag] ArgumentExpansion   Failed  Passed  900ms   Completed (SEGFAULT)

I cannot imagine why my change would generate such SEGFAULT series ...
-- 
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] Some dashboard warnings and errors

2012-05-21 Thread Eric Noulard
2012/5/21 Brad King brad.k...@kitware.com:
 On 05/21/2012 03:50 AM, Eric Noulard wrote:
 My merge of stage/CPack-activateRPM-DEB-onMacOS to next yesterday raised
 some warning on this dashboard:
 http://open.cdash.org/viewBuildError.php?type=1buildid=2293803

 the warning are right, the static method call *is always true* but
 shall I really try to avoid such warning?
 The always true may become some day not always true but I wanted to have
 CPackGeneratorFactory be coded in a uniform way.

 What shall I do with that?

 Try this:

 diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx 
 b/Source/CPack/cmCPackGeneratorFactory.cxx
 index dbfdbbc..37ff460 100644
 --- a/Source/CPack/cmCPackGeneratorFactory.cxx
 +++ b/Source/CPack/cmCPackGeneratorFactory.cxx
 @@ -40,6 +40,10 @@

  #include cmCPackLog.h

 +#if defined(__BORLANDC__)
 +# pragma warn -8008 /* condition is always true */
 +#endif
 +
  //--
  cmCPackGeneratorFactory::cmCPackGeneratorFactory()
  {

Ok just pushed that:
Merge topic 'CPack-activateRPM-DEB-onMacOS' into next

801ea70 Calm down Borland compiler warning about always true

 Then the same set of commits may be responsible for that:
 http://open.cdash.org/buildSummary.php?buildid=2294180

 but I can't find a reason for all 192 failing tests, can anyone enlight me?
 The only thing I see is

 [flag] ArgumentExpansion     Failed  Passed  900ms   Completed (SEGFAULT)

 I cannot imagine why my change would generate such SEGFAULT series ...

 The same machine passed its nightly build so something local must have
 gone wrong for the continuous.  I don't think it's related to your change.

ok then.

Thanks Brad.
-- 
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [cmake-developers] conditionals in generator expressions

2012-05-21 Thread Brad King
On 05/19/2012 04:45 PM, Alexander Neundorf wrote:
 On Thursday 17 May 2012, David Cole wrote:
 I don't think this conditional stuff in generator expressions is a good
 idea at all.
 
 Me too ;-)

The goal is to allow per-configuration/per-language/per-xyz values to
appear in places like the INCLUDE_DIRECTORIES property of a target.
Unlike COMPILE_DEFINITIONS the *order* of include directories matters.
Therefore we cannot have a separate INCLUDE_DIRECTORIES_CONFIG
property because there is no well-defined way to integrate its entries
with those of the main property.  There was discussion of this back
when Stephen first brought up his patch for per-target include
directories.  The solution is to have a single property only and put
the condition in the value.

Since the configuration is not known until generate time any condition
based on the configuration must be evaluated at generate time.  We need
to have generate-time evaluation of a condition stored in a value of a
property.  This touches on a declarative specification.  The closest we
have to this now is the debug and optimized keywords of tll().

-Brad
--

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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


[cmake-developers] [CMake 0013238]: set_tests_properties not documented

2012-05-21 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://cmake.org/Bug/view.php?id=13238 
== 
Reported By:Mathieu Malaterre
Assigned To:
== 
Project:CMake
Issue ID:   13238
Category:   CTest
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2012-05-21 10:55 EDT
Last Modified:  2012-05-21 10:55 EDT
== 
Summary:set_tests_properties not documented
Description: 
it would be nice if all properties of set_tests_properties would be documented.
It looks like the following are not documented:


$ grep key == Source/CTest/cmCTestTestHandler.cxx
  if ( key == WILL_FAIL )
  if ( key == ATTACHED_FILES )
  if ( key == ATTACHED_FILES_ON_FAIL )
  if ( key == RESOURCE_LOCK )
  if ( key == TIMEOUT )
  if ( key == COST )
  if ( key == REQUIRED_FILES )
  if ( key == RUN_SERIAL )
  if ( key == FAIL_REGULAR_EXPRESSION )
  if ( key == PROCESSORS )
  if ( key == DEPENDS )
  if ( key == ENVIRONMENT )
  if ( key == LABELS )
  if ( key == MEASUREMENT )
  if ( key == PASS_REGULAR_EXPRESSION )
  if ( key == WORKING_DIRECTORY )


== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2012-05-21 10:55 Mathieu MalaterreNew Issue
==

--

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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


[cmake-developers] [CMake 0013239]: Not all Fortran dependencies are recognized.

2012-05-21 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=13239 
== 
Reported By:C.M.
Assigned To:
== 
Project:CMake
Issue ID:   13239
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2012-05-21 11:09 EDT
Last Modified:  2012-05-21 11:09 EDT
== 
Summary:Not all Fortran dependencies are recognized.
Description: 
Pre-processor dependencies in FORTRAN using include files are not recognized
if specified as 
#include ...
which (at least for several Fortran preprocessors is a valid syntax), e.g.
http://www2.fz-juelich.de/jsc/docs/vendordocs/NAGWare_f95
/html/fpp.html#INCEXTERNAL




Steps to Reproduce: 
Generate any Fortran file and insert an include statement
#include file
into it. Check the *.depend files. The include file is not listed.
Using 
#include file
does however list the dependency correctly.


Additional Information: 
Reason for this behavior is the flex rule in cmDependsFortranLexer.in.l
line 73-90 and 111 which allows strings only as  or ''. Adding here
a third string rule for ... does quick fix the problem. However, one probably
should create a new string type and add/change the CPP_INCLUDE parser rule
in cmDependsFortranParser.y as well to not allow all strings to be .

== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2012-05-21 11:09 C.M.   New Issue
==

--

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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


[cmake-developers] [CMake 0013240]: update documentation for FindPythonLibs.cmake

2012-05-21 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://cmake.org/Bug/view.php?id=13240 
== 
Reported By:Zack Galbreath
Assigned To:
== 
Project:CMake
Issue ID:   13240
Category:   Documentation
Reproducibility:N/A
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2012-05-21 11:21 EDT
Last Modified:  2012-05-21 11:21 EDT
== 
Summary:update documentation for FindPythonLibs.cmake
Description: 
A CMake user approached me with the problem that they couldn't change which
installed version of Python was picked up by CMake.  This is actually possible,
but they were confused because the variables mentioned in the documentation do
not include the ones that you actually need to change (the cache variables).

Steps to Reproduce: 
N/A

Additional Information: 
Attached is a patch to update the documentation, informing users on how to
change which installed version of Python is found by CMake.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2012-05-21 11:21 Zack Galbreath New Issue
2012-05-21 11:21 Zack Galbreath File Added:
0001-Improve-documentation-for-FindPythonLibs.patch
==

--

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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


[cmake-developers] [CMake 0013241]: WriteBasicConfigVersionFile produces bad files without CMAKE_SIZEOF_VOID_P

2012-05-21 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=13241 
== 
Reported By:Brad King
Assigned To:Alex Neundorf
== 
Project:CMake
Issue ID:   13241
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: assigned
Target Version: CMake 2.8.9
== 
Date Submitted: 2012-05-21 11:49 EDT
Last Modified:  2012-05-21 11:49 EDT
== 
Summary:WriteBasicConfigVersionFile produces bad files
without CMAKE_SIZEOF_VOID_P
Description: 
Modules/BasicConfigVersion-*.cmake.in contain the code

# check that the installed version has the same 32/64bit-ness as the one which
is currently searching:
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_UNSUITABLE TRUE)
endif()

When this is configured with an empty CMAKE_SIZEOF_VOID_P the resulting file
breaks.  This breaks find_package calls that load the version file with an
outright error instead of reporting an unsuitable version.


== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2012-05-21 11:49 Brad King  New Issue
2012-05-21 11:49 Brad King  Status   new = assigned 
2012-05-21 11:49 Brad King  Assigned To   = Alex Neundorf   
==

--

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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [CMake] How to use verbose and debug output for CPack under VS

2012-05-21 Thread norulez
Is there an environment variable or a CMake/CPack variable which is must set?

Thanks in advance

Am 20.05.2012 um 20:10 schrieb noru...@me.com:

 Hello,
 
 how can I configure a project for Visual Studio to use the --verbose and 
 the --debug options/command line parameters?
 
 Thanks in advance
 
 Best Regards
 NoRulez
 --
 
 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] Windows 260 Char Limit Hit with CPack

2012-05-21 Thread Eric Noulard
2012/5/21 David A. Alexander alexa...@txcorp.com:

 We are running CPack remotely through Jenkins [1] to end up running a
 build/package process on a Windows 2008 Server machine and are seeing errors
 during the install into the _CPack_Packages directory because file paths
 exceeds the windows 260 character limit [2].  We have seen posts about this
 problem [3] where the solution is to build outside of the source directory,
 but this is not desirable for us because with Jenkins we want to save build
 artifacts and look at the workspace remotely.  For those not familiar with
 Jenkins, the shortest build path starts with...

 C:\user_name\jenkins\workspace\project_name\configuration_name\machine_name

 And any builds that are put under this base directory are then accessible
 through the web interface, which is very desirable for us.  If we build
 out-of-place, then CPack works, but we don't see any of the build
 information through the Jenkins interface.

 We can make all of the names short, but we still run over the 260 character
 because the directories being copied during the install involve many
 subdirectories. This is due to third-party software that we can not control.
  What we would like is to be able to customize the destination directory for
 the CPack install (i.e. define the _CPack_Packages directory, so that can be
 in something like C:\tmp\_CPack_Package to stay under the 260 character
 limit).

 Is there any way to set where the _CPack_Packages directory ends up rather
 than having it under the build directory?  We can build CMake itself and, if
 necessary, patch it to set this property.  In other words, if we can make
 some change/customization in CMake where all of the _CPack_Packages
 directories land under C:\tmp or some other short directory, then that is an
 acceptable solution.  We just need to know what code to change.

You should try

cpack -B C:\tmp

it should do exactly what you want, as the doc says:

  -B package directory  = override/define CPACK_PACKAGE_DIRECTORY

This may be unclear but
CPACK_PACKAGE_DIRECTORY is the base name used by CPack to do all the
packaging.

You should be able to
set(CPACK_PACKAGE_DIRECTORY C:/tmp) in your CMakeLists.txt as well
then run CPack as usual.

AFAIK it is seldom used so if you encounter any issue with that you
can try to track down
the problem in the source with git grep CPACK_PACKAGE_DIRECTORY
and report any bug on the tracker.

-- 
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.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] How to use verbose and debug output for CPack under VS

2012-05-21 Thread Eric Noulard
2012/5/21  noru...@me.com:
 Is there an environment variable or a CMake/CPack variable which is must set?

Currently AFAIK there aren't any.
But it would be easy to add, you may propose a patch.

 how can I configure a project for Visual Studio to use the --verbose and 
 the --debug
 options/command line parameters?

As a workaround I would suggest to craft a custom target that will do the job:

add_custom_target(PACKAGE_DEBUG
  COMMAND ${CMAKE_CPACK_COMMAND} --debug --verbose
--config CPackConfig.cmake
  COMMENTS Build package with debug and verbose output)
-- 
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.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


[CMake] Packaging : Debug + Release together

2012-05-21 Thread Nicholas Yue

Hi,

I can build debug and release code by setting the CMAKE_BUILD_TYPE 
variable.


What is the recommend process/workflow if I wish to 
build/install/package both the Debug and Release build into a single 
e.g. RPM, as part of an automated process (e.g. nightly build) ?


How will CPack find the different builds for packaging ?

Regards

--
Nicholas Yue
Graphics - RenderMan, Visualization, OpenGL, HDF5
Custom Dev - C++ porting, OSX, Linux, Windows
Management - Recruitment, career management
http://www.proceduralinsight.com/
http://au.linkedin.com/in/nicholasyue

--

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] Why is Ninja generator disabled by default?

2012-05-21 Thread Bill Hoffman

On 5/20/2012 7:58 AM, Claus Klein wrote:


So please, there is no reason to disable the ninja generator by default.



Sorry, until it actually works with full features I can not do that. 
OSX needs the frameworks and application bundles implemented.  Windows 
needs file level depends.  Too many projects depend on those features. 
I realized there are use cases that do not use those features on OSX, 
but if you are building any application on OSX natively that has a GUI 
it will not work without those features.


-Bill
--

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] Why is Ninja generator disabled by default?

2012-05-21 Thread David Cole
On Mon, May 21, 2012 at 9:01 AM, Bill Hoffman bill.hoff...@kitware.comwrote:

 On 5/20/2012 7:58 AM, Claus Klein wrote:


 So please, there is no reason to disable the ninja generator by default.



 Sorry, until it actually works with full features I can not do that. OSX
 needs the frameworks and application bundles implemented.  Windows needs
 file level depends.  Too many projects depend on those features. I realized
 there are use cases that do not use those features on OSX, but if you are
 building any application on OSX natively that has a GUI it will not work
 without those features.


 -Bill
 --

 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



I agree with Bill here -- we cannot turn it on by default until it works
sufficiently for typical use cases.

For specialized use cases, if you know you want to turn it on, you can
easily re-build a CMake of your own that has it enabled. Simply turn on the
advanced cache option CMAKE_ENABLE_NINJA when configuring CMake.


HTH,
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] Downgrade CMake

2012-05-21 Thread David Cole
You can simply unzip the .tar.gz rather than using the *.dmg installer. And
then move it into /Applications if that's where you want it.

Not sure how to completely remove knowledge of a newer CMake from the whole
OS. I know there is a history of what you've installed in the file
/Library/Receipts/InstallHistory.plist -- but not sure why it thinks it's
still installed if you've deleted it.

May I ask: why are you downgrading? Is there something wrong with CMake
2.8.8 that prevents you from using it? There have been hundreds of bug
fixes since the 2.8.4 release, so I would recommend sticking with 2.8.8 if
at all possible.


HTH,
David


On Sun, May 20, 2012 at 8:57 AM, Sason Ohanian Saki sa...@kth.se wrote:

 Hi! I want to downgrade from cmake 2.8-8 to 2.8-4 on OS X. Is there an
 easy way to do this? I tried to remove CMake from applications but the
 installer still says that a newer version already exists?

 Thanks!

 /Sason
 --

 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] How to use verbose and debug output for CPack under VS

2012-05-21 Thread David Cole
On Mon, May 21, 2012 at 3:30 AM, Eric Noulard eric.noul...@gmail.comwrote:

 2012/5/21  noru...@me.com:
  Is there an environment variable or a CMake/CPack variable which is must
 set?

 Currently AFAIK there aren't any.
 But it would be easy to add, you may propose a patch.

  how can I configure a project for Visual Studio to use the --verbose
 and the --debug
  options/command line parameters?

 As a workaround I would suggest to craft a custom target that will do the
 job:

 add_custom_target(PACKAGE_DEBUG
  COMMAND ${CMAKE_CPACK_COMMAND} --debug --verbose
 --config CPackConfig.cmake
  COMMENTS Build package with debug and verbose output)
 --
 Erk
 Le gouvernement représentatif n'est pas la démocratie --
 http://www.le-message.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



I don't think this needs to be done very often, and is not worth making a
change in CMake for... (So I don't want a patch for it... thanks, anyway)
You can easily edit the custom command that CMake already generates for
running CPack directly in the Visual Studio gui if you need to add command
line arguments for debugging purposes.

Simply right click the PACKAGE project, and choose Properties -- when
the property pages come up, look for Build Events and Post-Build Event
and edit the command line for the post build event.

You can see there's one line in there that calls cpack with something like:

  C:\Program Files (x86)\CMake 2.8\bin\cpack.exe -C $(Configuration)
--config ./CPackConfig.cmake

Just add your --verbose and --debug there, and then right click the
PACKAGE project again, and choose Project Only  Build Only PACKAGE to
execute the post build command that you just edited...


Alternatively, besides some environment differences (which may but don't
typically cause final package differences), there should be no reason you
can't just run cpack directly from a command prompt in your build tree and
get the exact same package.


HTH,
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] How to use verbose and debug output for CPack under VS

2012-05-21 Thread norulez
Thanks, the custom command works

Am 21.05.2012 um 17:41 schrieb David Cole david.c...@kitware.com:

 On Mon, May 21, 2012 at 3:30 AM, Eric Noulard eric.noul...@gmail.com wrote:
 2012/5/21  noru...@me.com:
  Is there an environment variable or a CMake/CPack variable which is must 
  set?
 
 Currently AFAIK there aren't any.
 But it would be easy to add, you may propose a patch.
 
  how can I configure a project for Visual Studio to use the --verbose and 
  the --debug
  options/command line parameters?
 
 As a workaround I would suggest to craft a custom target that will do the job:
 
 add_custom_target(PACKAGE_DEBUG
  COMMAND ${CMAKE_CPACK_COMMAND} --debug --verbose
 --config CPackConfig.cmake
  COMMENTS Build package with debug and verbose output)
 --
 Erk
 Le gouvernement représentatif n'est pas la démocratie --
 http://www.le-message.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
 
 
 I don't think this needs to be done very often, and is not worth making a 
 change in CMake for... (So I don't want a patch for it... thanks, anyway)  
 You can easily edit the custom command that CMake already generates for 
 running CPack directly in the Visual Studio gui if you need to add command 
 line arguments for debugging purposes.
 
 Simply right click the PACKAGE project, and choose Properties -- when the 
 property pages come up, look for Build Events and Post-Build Event and 
 edit the command line for the post build event.
 
 You can see there's one line in there that calls cpack with something like:
 
   C:\Program Files (x86)\CMake 2.8\bin\cpack.exe -C $(Configuration) 
 --config ./CPackConfig.cmake
 
 Just add your --verbose and --debug there, and then right click the PACKAGE 
 project again, and choose Project Only  Build Only PACKAGE to execute the 
 post build command that you just edited...
 
 
 Alternatively, besides some environment differences (which may but don't 
 typically cause final package differences), there should be no reason you 
 can't just run cpack directly from a command prompt in your build tree and 
 get the exact same package.
 
 
 HTH,
 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] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread NoRulez
Hi,I know that the install commands collect files and copy them into the temporary cpack directory for the specified generator.How is it possible to install an application for example into those folders:C:\myappC:\somefolderI defined 'Var CustomDir="C:\somefolder"' in the NSIS template.When I then use the following in the CMakeLists.txt:install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION $CustomDir)Then the files are installed in _CPACK_PACKAGES/NSIS/myproject_1.0.0.1/$CustomDir.The generated project.nsi has the content: $INSTDIR\$CustomDir\...How can I avoid that $INSTDIR\ is added, or did I need to use the install command in a different way?Thanks in advanceBest RegardsNoRulez--

Powered by www.kitware.com

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

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

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

Re: [CMake] CPack doesn't recognize custom templates

2012-05-21 Thread norulez
I don't know how, but the problem is solved. If I find out the problem I'll 
post it on the list.

What i've done was to begin from scratch with the installers CMakeLists.txt and 
the custom NSIS template.

Much thanks to Eric and David for the hint with the --verbose --debug command 
line arguments

Best Regards

Am 19.05.2012 um 20:51 schrieb noru...@me.com:

 Sorry, but the project is a commercial application.
 
 Did you mean this site? http://www.cmake.org/cmake/help/cmake_tutorial.html#s7
 
 But there must something in the original *.nsi file, because if I use the 
 original file then the files get copied (Without changing the CMakeLists.txt 
 file)
 
 On the workstations we use VS instead of nmake. Is there a way do call CPack 
 with the --verbose --debug options under VS without using nmake from the 
 command line?
 
 
 Am 19.05.2012 um 20:26 schrieb David Cole david.c...@kitware.com:
 
 CPack does a make install and puts your install tree underneath 
 _CPack_Packages.
 
 THEN, it calls NSIS with the *.nsi script, and packages that up into an 
 installer.
 
 There is nothing in the *.nsi file that copies anything into 
 _CPack_Packages. That happens before makensis is ever called.
 
 Please post some code, so we can help you figure out what is going on here.
 
 Is this in an open source project where we can inspect the code? Or can you 
 replicate your problem with the CMake/Tests/Tutorial/Step7 project?
 
 
 
 On Sat, May 19, 2012 at 2:02 PM, noru...@me.com wrote:
 Hello Eric,
 hello David,
 
 sorry for the long response time.
 
 I noticed that the custom CPackConfig is not necessary if I use variable 
 names beginning with CPACK_. So first I removed the custom file.
 
 Then the main problem...
 I don't use a changed NSIS.template.in file from the CMake installation. I 
 use a NSIS script from a college and tried to use it under CPack. This means 
 than I used CPACK variable names instead of hard coded values. However I'm a 
 NSIS novice, so it seems that in a CPACK variable and/or in the original 
 NSIS.template.in file are some commands which I didn't find. The only one I 
 need is the command which copies the necessary files into the temporary 
 CPack directory (_CPack_Packges).
 
 Which CPack variable and/or NSIS commands from the original template file 
 are required to solve this?
 
 Thanks in advance
 
 Best Regards
 
 Am 09.05.2012 um 20:45 schrieb NoRulez noru...@me.com:
  By the way could you try 2.8.8 instead of 2.8.7 ?
 Yes, I will try it tomorrow (I read the changelog 
 http://www.cmake.org/files/v2.8/CMakeChangeLog-2.8.8 but I can't find any 
 details where this behavior may be fixed)
 Because on our Buildserver CMake 2.8.7 is installed and if no relevant 
 changes are made in 2.8.8, then I would be happy if I could retain the 
 CMake 2.8.7 installation (Never change a running system ;-))
 
 But I will try 2.8.8 on the workstation and send you the output from 2.8.7 
 (--verbose --debug).
 
 Best Regards
 
 Am 09. Mai 2012 um 11:31 schrieb Eric Noulard eric.noul...@gmail.com:
 
 2012/5/9 noru...@me.com:
  Is it the case? Is there any file in 
  _CPack_Packages\win32\NSIS\MyProject
  ?
  No, there aren't any files
 
 
  Could you copy/paste the exact message you get and may be running cpack
  on the command line with ---verbose and --debug.
  Sure, but I can only do so tomorrow
 
 
  Nope normally you don't but what are you doing in your
  CPackConfig.cmake.in ?
  I only set the CPACK variables and additional variables which are used in
  the NSIS.template.in file.
  Because if I don't use the custom CPackConfig.cmake.in file then the
  variables in the NSIS.template.in files aren't resolved.
 
 Please send us those files.
 As usual the devil may be in the details.
 
  And do you have any INSTALL(CODE or INSTALL(SCRIPTS in your project?
  Yes, i use this for the BundleUtilities like in the BundleUtilities 
  example
 
  INSTALL(CODE 
  file(GLOB_RECURSE SHARED_LIBS
  \\${CMAKE_INSTALL_PREFIX}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\)
  include(BundleUtilities)
  fixup_bundle(\${APPS}\ \\${SHARED_LIBS}\ \${DIRS}\)
   COMPONENT Runtime)
 
 I'm not a BundleUtilities user but code like that may break with CPack 
 because
 CPack may internally use DESTDIR to do its local installation so that
 one should usually write:
 
 $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
 rather than
 ${CMAKE_INSTALL_PREFIX}
 
 however since you have NO file at all in the local CPack install dir,
 the problem is elsewhere.
 
 By the way could you try 2.8.8 instead of 2.8.7 ?
 
 -- 
 Erk
 Le gouvernement représentatif n'est pas la démocratie --
 http://www.le-message.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
 
 --
 
 Powered by www.kitware.com
 
 

Re: [CMake] CPack doesn't recognize custom templates

2012-05-21 Thread David Cole
On Sat, May 19, 2012 at 2:51 PM, noru...@me.com wrote:

 Sorry, but the project is a commercial application.

 Did you mean this site?
 http://www.cmake.org/cmake/help/cmake_tutorial.html#s7


No, I meant this directory within the CMake source tree:


http://cmake.org/gitweb?p=cmake.git;a=tree;f=Tests/Tutorial/Step7;hb=master
--

Powered by www.kitware.com

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

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

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

Re: [CMake] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread David Cole
The install rule:

  install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION
$CustomDir)

doesn't make sense because $CustomDir is not known at CMake-time or even at
build-time or install-time. It's not known except to NSIS at packaging time.

make install runs before NSIS runs.

Sounds like you need a completely custom installer -- if you have installed
files that are not contained within the make install tree prefix, then you
cannot use the recursive install all files from one root technique in the
NSIS script that CPack uses by default.


We generally encourage and expect a re-locatable install tree to be used
with the CPack built NSIS installers. (i.e. -- no matter where the end-user
finally installs your package, they will be able to run the installed
programs just fine.) That's why the entire install tree is copied using the
following:

  this-SetOptionIfNotSet(CPACK_NSIS_FULL_INSTALL,
File /r \${INST_DIR}\\*.*\);

That results in the following generated in project.nsi:

  File /r ${INST_DIR}\*.*

which installs all files and directories recursively (from your make
install tree) to the installation directory chosen by the end user of your
installation program.


This stuff is not easy, especially when we can't see your code.

Cheers, ( good luck),
David


On Mon, May 21, 2012 at 12:39 PM, NoRulez noru...@me.com wrote:

 Hi,

 I know that the install commands collect files and copy them into the
 temporary cpack directory for the specified generator.
 How is it possible to install an application for example into those
 folders:
 C:\myapp
 C:\somefolder

 I defined 'Var CustomDir=C:\somefolder' in the NSIS template.

 When I then use the following in the CMakeLists.txt:
 install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION
 $CustomDir)

 Then the files are installed in
 _CPACK_PACKAGES/NSIS/myproject_1.0.0.1/$CustomDir.
 The generated project.nsi has the content: $INSTDIR\$CustomDir\...

 How can I avoid that $INSTDIR\ is added, or did I need to use the install
 command in a different way?

 Thanks in advance

 Best Regards
 NoRulez

 --

 Powered by www.kitware.com

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

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

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

--

Powered by www.kitware.com

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

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

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

Re: [CMake] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread norulez
But what about other systems like linux. If I have an executable and shared 
libraries for example.
Then it is possible to install it under /opt/myproject, but it is not possible 
to install the executable under /usr/bin and the shared libraries under 
/usr/lib? Or did I misunderstood something?

Sorry, for simple installers the default NSIS template is great, but for 
customized ones it seems to be very difficult, isn't it?


Best Regards

Am 21.05.2012 um 19:27 schrieb David Cole david.c...@kitware.com:

 The install rule:
 
   install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION 
 $CustomDir)
 
 doesn't make sense because $CustomDir is not known at CMake-time or even at 
 build-time or install-time. It's not known except to NSIS at packaging time.
 
 make install runs before NSIS runs.
 
 Sounds like you need a completely custom installer -- if you have installed 
 files that are not contained within the make install tree prefix, then you 
 cannot use the recursive install all files from one root technique in the 
 NSIS script that CPack uses by default.
 
 
 We generally encourage and expect a re-locatable install tree to be used 
 with the CPack built NSIS installers. (i.e. -- no matter where the end-user 
 finally installs your package, they will be able to run the installed 
 programs just fine.) That's why the entire install tree is copied using the 
 following:
 
   this-SetOptionIfNotSet(CPACK_NSIS_FULL_INSTALL, 
 File /r \${INST_DIR}\\*.*\);
 
 That results in the following generated in project.nsi:
 
   File /r ${INST_DIR}\*.*
 
 which installs all files and directories recursively (from your make install 
 tree) to the installation directory chosen by the end user of your 
 installation program.
 
 
 This stuff is not easy, especially when we can't see your code.
 
 Cheers, ( good luck),
 David
 
 
 On Mon, May 21, 2012 at 12:39 PM, NoRulez noru...@me.com wrote:
 Hi,
 
 I know that the install commands collect files and copy them into the 
 temporary cpack directory for the specified generator.
 How is it possible to install an application for example into those folders:
 C:\myapp
 C:\somefolder
 
 I defined 'Var CustomDir=C:\somefolder' in the NSIS template.
 
 When I then use the following in the CMakeLists.txt:
 install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION 
 $CustomDir)
 
 Then the files are installed in 
 _CPACK_PACKAGES/NSIS/myproject_1.0.0.1/$CustomDir.
 The generated project.nsi has the content: $INSTDIR\$CustomDir\...
 
 How can I avoid that $INSTDIR\ is added, or did I need to use the install 
 command in a different way?
 
 Thanks in advance
 
 Best Regards
 NoRulez
 
 --
 
 Powered by www.kitware.com
 
 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html
 
 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ
 
 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake
 
--

Powered by www.kitware.com

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

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

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

Re: [CMake] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread David Cole
On Mon, May 21, 2012 at 2:05 PM, noru...@me.com wrote:

 But what about other systems like linux. If I have an executable and
 shared libraries for example.
 Then it is possible to install it under /opt/myproject, but it is not
 possible to install the executable under /usr/bin and the shared libraries
 under /usr/lib? Or did I misunderstood something?


But you don't build an NSIS installer based on those.




 Sorry, for simple installers the default NSIS template is great, but for
 customized ones it seems to be very difficult, isn't it?


Yes, you're correct. It takes some effort if you are not installing
everything underneath the directory that the end user chooses for your
final location.

It's quite good for simple installers and component-based installers --
beyond that, and especially putting things outside the location chosen by
the end user ... you're on your own.





 Best Regards

 Am 21.05.2012 um 19:27 schrieb David Cole david.c...@kitware.com:

 The install rule:

   install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION
 $CustomDir)

 doesn't make sense because $CustomDir is not known at CMake-time or even
 at build-time or install-time. It's not known except to NSIS at packaging
 time.

 make install runs before NSIS runs.

 Sounds like you need a completely custom installer -- if you have
 installed files that are not contained within the make install tree prefix,
 then you cannot use the recursive install all files from one root
 technique in the NSIS script that CPack uses by default.


 We generally encourage and expect a re-locatable install tree to be used
 with the CPack built NSIS installers. (i.e. -- no matter where the end-user
 finally installs your package, they will be able to run the installed
 programs just fine.) That's why the entire install tree is copied using the
 following:

   this-SetOptionIfNotSet(CPACK_NSIS_FULL_INSTALL,
 File /r \${INST_DIR}\\*.*\);

 That results in the following generated in project.nsi:

   File /r ${INST_DIR}\*.*

 which installs all files and directories recursively (from your make
 install tree) to the installation directory chosen by the end user of your
 installation program.


 This stuff is not easy, especially when we can't see your code.

 Cheers, ( good luck),
 David


 On Mon, May 21, 2012 at 12:39 PM, NoRulez noru...@me.com wrote:

 Hi,

 I know that the install commands collect files and copy them into the
 temporary cpack directory for the specified generator.
 How is it possible to install an application for example into those
 folders:
 C:\myapp
 C:\somefolder

 I defined 'Var CustomDir=C:\somefolder' in the NSIS template.

 When I then use the following in the CMakeLists.txt:
 install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION
 $CustomDir)

 Then the files are installed in
 _CPACK_PACKAGES/NSIS/myproject_1.0.0.1/$CustomDir.
 The generated project.nsi has the content: $INSTDIR\$CustomDir\...

 How can I avoid that $INSTDIR\ is added, or did I need to use the
 install command in a different way?

 Thanks in advance

 Best Regards
 NoRulez

 --

 Powered by www.kitware.com

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

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

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



--

Powered by www.kitware.com

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

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

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

Re: [CMake] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread norulez
I think one solution could be that the files must be copied with 
add_custom_command's, then run configure_file with the NSIS template to be able 
to use @ variables and then another add_custom_command to run NSIS.

Is there maybe a simpler solution or is this the correct way?


Am 21.05.2012 um 20:05 schrieb noru...@me.com:

 But what about other systems like linux. If I have an executable and shared 
 libraries for example.
 Then it is possible to install it under /opt/myproject, but it is not 
 possible to install the executable under /usr/bin and the shared libraries 
 under /usr/lib? Or did I misunderstood something?
 
 Sorry, for simple installers the default NSIS template is great, but for 
 customized ones it seems to be very difficult, isn't it?
 
 
 Best Regards
 
 Am 21.05.2012 um 19:27 schrieb David Cole david.c...@kitware.com:
 
 The install rule:
 
   install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION 
 $CustomDir)
 
 doesn't make sense because $CustomDir is not known at CMake-time or even at 
 build-time or install-time. It's not known except to NSIS at packaging time.
 
 make install runs before NSIS runs.
 
 Sounds like you need a completely custom installer -- if you have installed 
 files that are not contained within the make install tree prefix, then you 
 cannot use the recursive install all files from one root technique in the 
 NSIS script that CPack uses by default.
 
 
 We generally encourage and expect a re-locatable install tree to be used 
 with the CPack built NSIS installers. (i.e. -- no matter where the end-user 
 finally installs your package, they will be able to run the installed 
 programs just fine.) That's why the entire install tree is copied using the 
 following:
 
   this-SetOptionIfNotSet(CPACK_NSIS_FULL_INSTALL, 
 File /r \${INST_DIR}\\*.*\);
 
 That results in the following generated in project.nsi:
 
   File /r ${INST_DIR}\*.*
 
 which installs all files and directories recursively (from your make install 
 tree) to the installation directory chosen by the end user of your 
 installation program.
 
 
 This stuff is not easy, especially when we can't see your code.
 
 Cheers, ( good luck),
 David
 
 
 On Mon, May 21, 2012 at 12:39 PM, NoRulez noru...@me.com wrote:
 Hi,
 
 I know that the install commands collect files and copy them into the 
 temporary cpack directory for the specified generator.
 How is it possible to install an application for example into those folders:
 C:\myapp
 C:\somefolder
 
 I defined 'Var CustomDir=C:\somefolder' in the NSIS template.
 
 When I then use the following in the CMakeLists.txt:
 install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION 
 $CustomDir)
 
 Then the files are installed in 
 _CPACK_PACKAGES/NSIS/myproject_1.0.0.1/$CustomDir.
 The generated project.nsi has the content: $INSTDIR\$CustomDir\...
 
 How can I avoid that $INSTDIR\ is added, or did I need to use the install 
 command in a different way?
 
 Thanks in advance
 
 Best Regards
 NoRulez
 
 --
 
 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] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread David Cole
I think you need to do the NSIS script by hand to see what it looks like
and then ask the question how can I get CPack to use a project.nsi file
that looks like this?



On Mon, May 21, 2012 at 2:22 PM, noru...@me.com wrote:

 I think one solution could be that the files must be copied with
 add_custom_command's, then run configure_file with the NSIS template to be
 able to use @ variables and then another add_custom_command to run NSIS.

 Is there maybe a simpler solution or is this the correct way?


 Am 21.05.2012 um 20:05 schrieb noru...@me.com:

 But what about other systems like linux. If I have an executable and
 shared libraries for example.
 Then it is possible to install it under /opt/myproject, but it is not
 possible to install the executable under /usr/bin and the shared libraries
 under /usr/lib? Or did I misunderstood something?

 Sorry, for simple installers the default NSIS template is great, but for
 customized ones it seems to be very difficult, isn't it?


 Best Regards

 Am 21.05.2012 um 19:27 schrieb David Cole david.c...@kitware.com:

 The install rule:

   install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION
 $CustomDir)

 doesn't make sense because $CustomDir is not known at CMake-time or even
 at build-time or install-time. It's not known except to NSIS at packaging
 time.

 make install runs before NSIS runs.

 Sounds like you need a completely custom installer -- if you have
 installed files that are not contained within the make install tree prefix,
 then you cannot use the recursive install all files from one root
 technique in the NSIS script that CPack uses by default.


 We generally encourage and expect a re-locatable install tree to be used
 with the CPack built NSIS installers. (i.e. -- no matter where the end-user
 finally installs your package, they will be able to run the installed
 programs just fine.) That's why the entire install tree is copied using the
 following:

   this-SetOptionIfNotSet(CPACK_NSIS_FULL_INSTALL,
 File /r \${INST_DIR}\\*.*\);

 That results in the following generated in project.nsi:

   File /r ${INST_DIR}\*.*

 which installs all files and directories recursively (from your make
 install tree) to the installation directory chosen by the end user of your
 installation program.


 This stuff is not easy, especially when we can't see your code.

 Cheers, ( good luck),
 David


 On Mon, May 21, 2012 at 12:39 PM, NoRulez noru...@me.com wrote:

 Hi,

 I know that the install commands collect files and copy them into the
 temporary cpack directory for the specified generator.
 How is it possible to install an application for example into those
 folders:
 C:\myapp
 C:\somefolder

 I defined 'Var CustomDir=C:\somefolder' in the NSIS template.

 When I then use the following in the CMakeLists.txt:
 install(FILES ${CMAKE_SOURCE_DIR}/somefolder/myfile.txt DESTINATION
 $CustomDir)

 Then the files are installed in
 _CPACK_PACKAGES/NSIS/myproject_1.0.0.1/$CustomDir.
 The generated project.nsi has the content: $INSTDIR\$CustomDir\...

 How can I avoid that $INSTDIR\ is added, or did I need to use the
 install command in a different way?

 Thanks in advance

 Best Regards
 NoRulez

 --

 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

[CMake] generating gettext runtime environment on OSX Lion (.7z attachment)

2012-05-21 Thread David Aiken
The original message was held for review because the .zip attachment exceeded 
the 40k limit. 
This is using .7z compression, which gets well under the 40k limit. Ez7z was 
used to generate it
on OSX Lion.



 From: David Aiken david_ai...@yahoo.com
To: cmake@cmake.org cmake@cmake.org 
Sent: Monday, May 21, 2012 11:48:27 AM
Subject: generating gettext runtime environment on OSX Lion
 

hi all..

I'm trying to generate the runtime files necessary to support calls to 
gettext() on OSX Lion 10.7.4 with:
gettext 0.18.1
xcode 4.3.2

cmake 2.8.7

but so far no luck. I've attached a simple (well.. as simple as i could make 
it) project.. the binaries build on my box, but the translation files do not.
The cmake log is:

The C compiler identification is GNU 4.2.1
The CXX compiler identification is GNU 4.2.1
Checking whether C compiler has -isysroot
Checking whether C compiler has -isysroot - yes
Checking whether C compiler supports OSX deployment target flag
Checking whether C compiler supports OSX deployment target flag - yes
Check for working C compiler using: Xcode
Check for working C compiler using: Xcode -- works
Detecting C compiler ABI info
Detecting C compiler ABI info - done
Checking whether CXX compiler has -isysroot
Checking whether CXX compiler has -isysroot - yes
Checking whether CXX compiler supports OSX deployment target flag
Checking whether CXX compiler supports OSX deployment target flag - yes
Check for working CXX compiler using: Xcode
Check for working CXX compiler using: Xcode -- works
Detecting CXX compiler ABI info
Detecting CXX compiler ABI info - done
Found Gettext: /opt/local/bin/msgmerge (found version 0.18.1) 
Found LIBINTL: /usr/local/lib/libintl.dylib  
Configuring done
Generating done

and the build log for ALL_BUILD is:

Build target ZERO_CHECK

PhaseScriptExecution CMake Rules 
build/translation.build/Debug/ZERO_CHECK.build/Script-CC986575905544D58E84845A.sh
    cd /Volumes/untitled/test/translation
    /bin/sh -c 
/Volumes/untitled/test/translation/build/translation.build/Debug/ZERO_CHECK.build/Script-CC986575905544D58E84845A.sh

echo 

make -f /Volumes/untitled/test/translation/build/CMakeScripts/ReRunCMake.make
make[1]: `CMakeFiles/cmake.check_cache' is up to date.


Build target translations_2

PhaseScriptExecution CMake Rules 
build/utils/translation.build/Debug/translations_2.build/Script-C63B422217D34C39BB5AFCAA.sh
    cd /Volumes/untitled/test/translation
    /bin/sh -c 
/Volumes/untitled/test/translation/build/utils/translation.build/Debug/translations_2.build/Script-C63B422217D34C39BB5AFCAA.sh

make: *** No rule to make target 
`/Volumes/untitled/test/translation/utils/utils.pot', needed by 
`/Volumes/untitled/test/translation/build/utils/fr_CA.gmo'.  Stop.
Command /bin/sh failed with exit code 2


Build target utils

CompileC 
build/utils/translation.build/Debug/utils.build/Objects-normal/x86_64/utils.o 
utils/src/utils.cpp normal x86_64 c++ 
com.apple.compilers.llvm.clang.1_0.compiler
    cd /Volumes/untitled/test/translation
    setenv LANG en_US.US-ASCII
    
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 -x c++ -arch x86_64 -fmessage-length=0 -Wno-trigraphs -fpascal-strings -O0 
-Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type 
-Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors 
-Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function 
-Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value 
-Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants 
-Wno-sign-compare -Wno-shorten-64-to-32 -Wno-newline-eof -Wc++11-extensions 
-DCMAKE_INTDIR=\Debug\ -Dutils_EXPORTS -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
 -fasm-blocks -Wdeprecated-declarations -Winvalid-offsetof 
-mmacosx-version-min=10.7 -g -Wno-conversion -Wno-sign-conversion 
-I/Volumes/untitled/test/translation/build/utils/Debug/include
 
-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/local/include
 
-I/Volumes/untitled/test/translation/build/utils/translation.build/Debug/utils.build/DerivedSources/x86_64
 
-I/Volumes/untitled/test/translation/build/utils/translation.build/Debug/utils.build/DerivedSources
 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas 
-F/Volumes/untitled/test/translation/build/utils/Debug -fPIC -MMD -MT 
dependencies -MF 
/Volumes/untitled/test/translation/build/utils/translation.build/Debug/utils.build/Objects-normal/x86_64/utils.d
 --serialize-diagnostics 
/Volumes/untitled/test/translation/build/utils/translation.build/Debug/utils.build/Objects-normal/x86_64/utils.dia
 -c /Volumes/untitled/test/translation/utils/src/utils.cpp -o 
/Volumes/untitled/test/translation/build/utils/translation.build/Debug/utils.build/Objects-normal/x86_64/utils.o

Ld build/utils/Debug/libutils.dylib normal 

Re: [CMake] Ninja generator is Linux-only?

2012-05-21 Thread Dave Abrahams

on Wed May 16 2012, Bill Hoffman 
bill.hoffman-5opLkZggLXlBDgjK7y7TUQ-AT-public.gmane.org wrote:

 Ninja is currently not totally working on mac and windows.

 The limitations are:

 Windows:  file level dependencies are not working.
 Mac: Frameworks and application bundles are not working.

 Here are the dashboards with the failing tests:

 http://open.cdash.org/viewTest.php?onlyfailedbuildid=2281938
 http://open.cdash.org/viewTest.php?onlyfailedbuildid=2280676

 The Mac fix should be pretty simple.  It involves moving some code out
 of the makefile generator into a shared place with the ninja generator
 so that it can create the frameworks and bundles.

 The windows fix requires a change in upstream ninja.   Right now the
 ninaj cmake dashboard is using a fork of ninja to get response
 files. There is some version of that in the upstream ninja.  There is
 some discussion of some work that adds the depend information to
 ninja, but I don't think it is quite there.

 Both of these issues are serious enough that the support for ninja on
 these platforms is broken as far as cmake is concerned.

A shame.  Thanks for the explanation, though.

-- 
Dave Abrahams
BoostPro Computing
http://www.boostpro.com

--

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] fixup_bundle() doesn't like libglut.3.dylib

2012-05-21 Thread Joe Ping-Lin Hsiao
Thanks, David. It works!

Is it possible to do the other way around?
I want fixup_bundle() to treat
/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries/libclparser.dylib
as an external library instead of a system lib. I looked at functions
in BundleUtilities.cmake and GetPrerequisites.cmake but didn't get any
clue how to do that.

Thanks,
Joe

On Mon, May 14, 2012 at 8:47 PM, David Cole david.c...@kitware.com wrote:
 Rather than just doing a fixup_bundle as an INSTALL(CODE snippet, put it
 in a separate CMake script, and use install(SCRIPT to execute it. You can
 configure the script with configure_file if you need to put stuff in it that
 depends on CMake variables.

 Then, in your script:

   # Define the function before including BundleUtilities:
   function(gp_resolved_file_type_override resolved_file type_var)
     if(resolved_file MATCHES ^/usr/X11/lib)
       message(resolving ${resolved_file} as system)
       set(${type_var} system PARENT_SCOPE)
     endif()
   endfunction()

   include(BundleUtilities)

   fixup_bundle( ... )

 ParaView's install rules on the Mac do something like this, if you want to
 look at some example code.


 HTH,
 David


 On Mon, May 14, 2012 at 5:27 PM, Joe Ping-Lin Hsiao phs...@cs.unc.edu
 wrote:

 Thanks, this is exactly what I need.

 Just one question.  Why the function gp_resolved_file_type_override()
 cannot be seen if it is implemented in my project's CMakeLists.txt? I
 have to add it in GetPrerequisite.cmake module, but that's not good.

 Thanks,
 Joe

 On Mon, May 7, 2012 at 11:04 AM, David Cole david.c...@kitware.com
 wrote:
  /usr/X11/lib/libglut.dylib should probably be considered a system
  library that is not included in your final bundle.
 
  Therefore, all users of your application will have to have the Mac OS
  X version of X installed and available in order to run your program.
  (Is that all Macs nowadays anyway...?)
 
  In order to classify it as a system library, you can provide a CMake
  function named gp_resolved_file_type_override to look for that library
  (probably anything starting with /usr/X11/lib) and set its type to
  system -- that will cause fixup_bundle to ignore it for copying and
  fixup purposes.
 
 
  HTH,
  David
 
 
  On Mon, May 7, 2012 at 10:57 AM, Joe Ping-Lin Hsiao phs...@cs.unc.edu
  wrote:
  Hi,
 
  I use CMake to create an installer for a Mac program which uses GLUT.
  The GLUT library that the program links against with is
  /usr/X11/lib/libglut.dylib.
 
  When I use fixup_bundle() to create an installer, I get the following
  error message:
 
  install_name_tool: changing install names or rpaths can't be redone
  for:
  /Users/phsiao/dev/video/video_spot_tracker.app/Contents/MacOS/libglut.3.dylib
  (for architecture ppc7400) because larger updated load commands do not
  fit (the program must be relinked, and you may need to use -headerpad
  or -headerpad_max_install_names)
 
  The first thing I tried was to add -headerpad_max_install_names and
  -headerpad to the linker flags, but no success. (Actually
  -headerpad_max_install_names already exists in CMakeFies/link.txt
  before I put it in.)
 
  The next thing I tried was to add '-arch x86_64' to both CXX_FLAGS and
  LINKER_FLAGS to avoid fixup_bundle() to fix dependencies for
  architecture ppc7400, but the error remains.
 
  Any idea how to get around this?
 
  Thanks,
  Joe
  --
 
  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] Why is Ninja generator disabled by default?

2012-05-21 Thread Andreas Mohr
Hi,

On Mon, May 21, 2012 at 10:40:03AM -0400, cmake-requ...@cmake.org wrote:
 From: David Cole david.c...@kitware.com
 I agree with Bill here -- we cannot turn it on by default until it works
 sufficiently for typical use cases.

So, what would be needed to turn CMake on by default?
'cause it does not work sufficiently for typical use cases :-
/asbestos_suit


While there might be backwards compatibility reasons for only actually
having Ninja truly enabled once it truly works (after all after some years
certain user code may resort to merely checking whether the feature
is provided or not, rather than doing sufficiently precise checks
well, in this CMake pre-beta it actually was still broken,
and 3 days later they fixed it),
I cannot help but wonder whether this configuration (build-time disabling
rather than a slightly special way of runtime disabling)
is hindering progress a bit due to artificially limiting developer uptake.
OTOH people who tend to like playing with certain bleeding edge things (like me)
are actually able to enable it manually - it's just somewhat more
effort:

 For specialized use cases, if you know you want to turn it on, you can
 easily re-build a CMake of your own that has it enabled. Simply turn on the
 advanced cache option CMAKE_ENABLE_NINJA when configuring CMake.


Andreas Mohr
--

Powered by www.kitware.com

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

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

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


Re: [CMake] CPack: Installing applications in separate folders (NSIS)

2012-05-21 Thread Eric Noulard
2012/5/21 David Cole david.c...@kitware.com:
 On Mon, May 21, 2012 at 2:05 PM, noru...@me.com wrote:

 But what about other systems like linux. If I have an executable and
 shared libraries for example.
 Then it is possible to install it under /opt/myproject, but it is not
 possible to install the executable under /usr/bin and the shared libraries
 under /usr/lib? Or did I misunderstood something?


 But you don't build an NSIS installer based on those.

And installing lib in /usr/lib and exe in /usr/bin IS possible
because the 2 path shares the /usr prefix.

On Linux if you build an RPM or DEB package which contains various
prefix (/usr /opt etc..) you either get a non relocatable package
or decide that some files are special like config files.

but David is right this does not work with NSIS.

 Sorry, for simple installers the default NSIS template is great, but for
 customized ones it seems to be very difficult, isn't it?

As difficult as it is with NSIS alone :-]

 Yes, you're correct. It takes some effort if you are not installing
 everything underneath the directory that the end user chooses for your final
 location.

 It's quite good for simple installers and component-based installers --
 beyond that, and especially putting things outside the location chosen by
 the end user ... you're on your own.

If you do have 2 separate unrelated installation prefixes
may be you can just build 2 NSIS installers
(which contains only one prefix)
using CPack twice out of 2 differents configurations of the same project

Or craft your own project.nsi file.

-- 
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.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] Packaging : Debug + Release together

2012-05-21 Thread Eric Noulard
2012/5/21 Nicholas Yue yue.nicho...@gmail.com:
 Hi,

    I can build debug and release code by setting the CMAKE_BUILD_TYPE
 variable.

    What is the recommend process/workflow if I wish to build/install/package
 both the Debug and Release build into a single e.g. RPM, as part of an
 automated process (e.g. nightly build) ?

Currently CPack cannot do that out of the box because CMake cannot do
that either.
CMake requires 2 build trees for that (at least on Linux)

    How will CPack find the different builds for packaging ?

He won't.

May be it's possible to craft your own CPackConfig.cmake file which would
refer to the 2 build trees but how would you ensure that there won't
be any name collision between debug and release tree?

Shall they be installed in different place /prefix ?
What would be the layout of the expected unique RPM ?



-- 
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.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


[CMake] the list parameter passed to function

2012-05-21 Thread Marmot Ken
here is the function :

FUNCTION( Append_headers_to_src_list  src_list_out src_list_in
header_file_path_in )
MESSAGE( src_list_in   : ${src_list_in} )
FILE( GLOB_RECURSE TEMP_LIST ${header_file_path_in}/*.h )
SET( ${src_list_out} ${src_list_in} ${TEMP_LIST} PARENT_SCOPE )
ENDFUNCTION( Append_headers_to_src_list


here is the place where the function is invoked:

AUX_SOURCE_DIRECTORY( . SRC_LIST  )
MESSAGE( SRC_LIST   : ${SRC_LIST}  )

Append_headers_to_src_list( SRC_LIST  ${SRC_LIST}
${CMAKE_SOURCE_DIR}/include/test  )

here is output :

SRC_LIST : ./a.cpp;./c.cpp;./main.cpp
src_list_in : ./a.cpp

Output expected :

SRC_LIST : ./a.cpp;./c.cpp;./main.cpp
src_list_in : ./a.cpp

Question:
 1  how to get expected Output ?
2  why ?

Thanks.
--

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.8-2900-ga8c7bd9

2012-05-21 Thread Eric Noulard
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  a8c7bd98847059b4ff29d7e254aa97f658c50804 (commit)
   via  801ea70c08a15071a22149c8f8f829a34e628c6a (commit)
  from  8bf185c42eafb51321a9bdb6c0c2720eaebe20b8 (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=a8c7bd98847059b4ff29d7e254aa97f658c50804
commit a8c7bd98847059b4ff29d7e254aa97f658c50804
Merge: 8bf185c 801ea70
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Mon May 21 08:42:11 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 21 08:42:11 2012 -0400

Merge topic 'CPack-activateRPM-DEB-onMacOS' into next

801ea70 Calm down Borland compiler warning about always true


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=801ea70c08a15071a22149c8f8f829a34e628c6a
commit 801ea70c08a15071a22149c8f8f829a34e628c6a
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Mon May 21 14:39:18 2012 +0200
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Mon May 21 14:39:18 2012 +0200

Calm down Borland compiler warning about always true

diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx 
b/Source/CPack/cmCPackGeneratorFactory.cxx
index dbfdbbc..37ff460 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -40,6 +40,10 @@
 
 #include cmCPackLog.h
 
+#if defined(__BORLANDC__)
+# pragma warn -8008 /* condition is always true */
+#endif
+
 //--
 cmCPackGeneratorFactory::cmCPackGeneratorFactory()
 {

---

Summary of changes:
 Source/CPack/cmCPackGeneratorFactory.cxx |4 
 1 files changed, 4 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.8-2902-ge86f944

2012-05-21 Thread Stephen Kelly
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  e86f944d54cc9cc59732a613e2dc483b56e0e730 (commit)
   via  113fb567b6908670faf49fd1860896b442f344b0 (commit)
  from  a8c7bd98847059b4ff29d7e254aa97f658c50804 (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=e86f944d54cc9cc59732a613e2dc483b56e0e730
commit e86f944d54cc9cc59732a613e2dc483b56e0e730
Merge: a8c7bd9 113fb56
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon May 21 13:06:52 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 21 13:06:52 2012 -0400

Merge topic 'relative-INCLUDE_DIRECTORIES' into next

113fb56 Revert Make the INCLUDE_DIRECTORIES property relative to the 
source dir by default.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=113fb567b6908670faf49fd1860896b442f344b0
commit 113fb567b6908670faf49fd1860896b442f344b0
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon May 21 19:04:42 2012 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon May 21 19:04:42 2012 +0200

Revert Make the INCLUDE_DIRECTORIES property relative to the source dir by 
default.

This reverts commit 3905129ad9bcf0147457ca26c02ba2a66125a3cf.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2c64579..4789197 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4709,13 +4709,9 @@ std::vectorstd::string 
cmTarget::GetIncludeDirectories()
   for(std::vectorstd::string::const_iterator
   li = includes.begin(); li != includes.end(); ++li)
 {
-// Treat relative paths as relative to the source dir.
-std::string dir = (cmSystemTools::CollapseFullPath
- (li-c_str(), this-Makefile-GetCurrentDirectory()));
-
-if(uniqueIncludes.insert(dir).second)
+if(uniqueIncludes.insert(*li).second)
   {
-  orderedAndUniqueIncludes.push_back(dir);
+  orderedAndUniqueIncludes.push_back(*li);
   }
 }
 
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 503f09f..2cf36f5 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -23,7 +23,4 @@ add_executable(TargetIncludeDirectories main.cpp)
 set_property(TARGET TargetIncludeDirectories APPEND PROPERTY 
INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/bat)
 set_property(TARGET TargetIncludeDirectories APPEND PROPERTY 
INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/foo)
 
-# Test that relative directories are relative to the source dir.
-set_property(TARGET TargetIncludeDirectories APPEND PROPERTY 
INCLUDE_DIRECTORIES source_include_dir)
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/baz)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp 
b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
index c854052..8aa3532 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
@@ -4,8 +4,6 @@
 #include foo.h
 #include baz.h
 
-#include source_header.h
-
 int main(int, char**)
 {
   return 0;
diff --git 
a/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
 
b/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
deleted file mode 100644
index 1296bcf..000
--- 
a/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef SOURCE_HEADER_H
-#define SOURCE_HEADER_H
-
-enum {
-  non_empty_header = 10
-};
-
-#endif

---

Summary of changes:
 Source/cmTarget.cxx|8 ++--
 .../TargetIncludeDirectories/CMakeLists.txt|3 ---
 .../TargetIncludeDirectories/main.cpp  |2 --
 .../source_include_dir/source_header.h |9 -
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 
Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h


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.8-2908-gc3352f9

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

The branch, next has been updated
   via  c3352f94791c11a47050ef26515e4d7374d2bfb8 (commit)
   via  c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe (commit)
   via  4af648041dd1f5589bd117145b091fc088aee56e (commit)
   via  4742eec96a115641033662fd1594a96cea15cef7 (commit)
   via  e2d71bb69354facbdd1df4d487ee897cecb9f30e (commit)
   via  cb37cae6918782d5bef6d30c30bee033de000372 (commit)
  from  e86f944d54cc9cc59732a613e2dc483b56e0e730 (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=c3352f94791c11a47050ef26515e4d7374d2bfb8
commit c3352f94791c11a47050ef26515e4d7374d2bfb8
Merge: e86f944 c9097c7
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon May 21 18:59:49 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 21 18:59:49 2012 -0400

Merge topic 'ExternalProject-Ninja-superbuild' into next

c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
4af6480 CMake Nightly Date Stamp
4742eec CMake Nightly Date Stamp
e2d71bb CMake Nightly Date Stamp
cb37cae CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe
commit c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Mon May 21 14:49:00 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon May 21 18:57:11 2012 -0400

ExternalProject: Fix 'make' builds with Ninja (#13159)

Fix the build command when Ninja is the CMake Generator, but the
external project is created for a project that does not use CMake but
does use make.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0353e45..a0a9aea 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -712,8 +712,12 @@ function(_ep_get_build_command name step cmd_var)
   endif()
 else() # if(cfg_cmd_id STREQUAL configure)
   # Non-CMake project.  Guess make and make install and make test.
-  # But use $(MAKE) to get recursive parallel make.
-  set(cmd $(MAKE))
+  if(${CMAKE_GENERATOR} MATCHES Makefiles)
+# Try to get the parallel arguments
+set(cmd $(MAKE))
+  else()
+set(cmd make)
+  endif()
   if(step STREQUAL INSTALL)
 set(args install)
   endif()

---

Summary of changes:
 Modules/ExternalProject.cmake |8 ++--
 Source/CMakeVersion.cmake |2 +-
 2 files changed, 7 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, master, updated. v2.8.8-197-gf2656e4

2012-05-21 Thread Kitware 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  f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc (commit)
  from  4af648041dd1f5589bd117145b091fc088aee56e (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=f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc
commit f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc
Author: Kitware Robot kwro...@kitware.com
AuthorDate: Tue May 22 00:01:04 2012 -0400
Commit: Kitware Robot kwro...@kitware.com
CommitDate: Tue May 22 00:01:04 2012 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3f5edf4..c2c577e 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,5 +2,5 @@
 SET(CMake_VERSION_MAJOR 2)
 SET(CMake_VERSION_MINOR 8)
 SET(CMake_VERSION_PATCH 8)
-SET(CMake_VERSION_TWEAK 20120521)
+SET(CMake_VERSION_TWEAK 20120522)
 #SET(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.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