[cmake-developers] [CMake 0014325]: Cmake parser rejects empty items list in target_include_directories

2013-07-31 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=14325 
== 
Reported By:Gregor Jasny
Assigned To:
== 
Project:CMake
Issue ID:   14325
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2013-07-31 05:38 EDT
Last Modified:  2013-07-31 05:38 EDT
== 
Summary:Cmake parser rejects empty items list in
target_include_directories
Description: 
I wonder if cmake should be able to parse the following project file:

  cmake_minimum_required(VERSION 2.8.11)
  project(Foo)

  add_library(mylib STATIC mylib.c)

  #set(a a)

  target_include_directories(mylib PUBLIC ${a})


The help text for target_include_directories shows the following syntax:

  target_include_directories(target [BEFORE
  INTERFACE|PUBLIC|PRIVATE [items1...]
 [INTERFACE|PUBLIC|PRIVATE [items2...] ...])

So I would consider the item list in the [] brackets as optional.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-07-31 05:38 Gregor Jasny   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


Re: [cmake-developers] Introducing the ${Foo_TARGETS} variable (IntroduceTARGETSVariable branch)

2013-07-31 Thread Stephen Kelly
Alexander Neundorf wrote:

 Comments ?
 If possible, I'd like to get that into 2.8.12.

Note that even in KDE there isn't consensus on whether to rely on this in 
the non-short term:

 http://thread.gmane.org/gmane.comp.kde.devel.core/80233/focus=80241

I don't see any particular reason to get it into 2.8.12. From the KDE 
perspective, I think it would be more useful to get a CMake version with 
ALIAS targets and double-colons-means-IMPORTED.

My preference is for 2.8.12 to be out soon and get those features into 
2.8.13. 

When do you want to create 2.8.12 RC1?

Thanks,

Steve.


--

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] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Stephen Kelly
Brad King wrote:

 On 07/30/2013 09:46 AM, Stephen Kelly wrote:
 That is, parameters to install(TARGETS) are evaluated at export time, and
 otherwise the contents of the property are reproduced verbatim.
 
 Yes, I think this makes sense.  The install rules run as part of
 the current project's build just like custom commands, so it makes
 sense to evaluate generator expressions immediately.  However, the
 implementation may be a bit complicated because now cmake_install.cmake
 script code will have to branch on BUILD_TYPE to pick which install
 rule to run.  There is already infrastructure for this to support
 the CONFIGURATIONS option of install(TARGETS) so maybe it is okay.


I think two things are being confused here. One is the DESTINATION for 
things that are installed by the current command. Eg:

 install(TARGETS foo 
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
 install(FILES foo.h 
   DESTINATION include
 )

The bug report is about adding genex support to those destinations.

The new feature is 

 install(TARGETS foo 
   INCLUDES DESTINATION include
 )

which does not result in installing anything to 'include/', but only 
populates a property. This is quite separate to what you describe above. I 
propose that we deal with what you describe above after 2.8.12.

For supporting generator expressions in 

 install(TARGETS foo 
   INCLUDES DESTINATION include
 )

I've pushed a INCLUDES-DESTINATION-partial-eval topic to my clone with some 
ideas for it. Please let me know what you think.

Thanks,

Steve.


--

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 0014326]: VS2012 generator ignores /SUBSYSTEM:WNDOWS

2013-07-31 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=14326 
== 
Reported By:Soeren Freudiger
Assigned To:
== 
Project:CMake
Issue ID:   14326
Category:   (No Category)
Reproducibility:always
Severity:   minor
Priority:   high
Status: new
== 
Date Submitted: 2013-07-31 08:02 EDT
Last Modified:  2013-07-31 08:02 EDT
== 
Summary:VS2012 generator ignores /SUBSYSTEM:WNDOWS
Description: 
We define for all Win and MFC projects the Subystem with /SUBSYSTEM:WINDOWS.
This works very well for VS2003/2005 and 2008 (2010 we did not try).

But for VS2012 this flag is ignored by cmake. Only at

  add_executable( MY_TARGET WIN32 ${MY_files} )

we obtain the correct flag. 

Otherwise we find 

   /CONSOLE:CONSOLE5,01

inside the link options...




Steps to Reproduce: 
first we add the link option with:

set_target_properties( MY_TARGET PROPERTIES  LINK_FLAGS_DEBUG
/SUBSYSTEM:WINDOWS)

then we set
   set(CMAKE_MFC_FLAG 1) http://www.cmake.org/Bug/view.php?id=1 for static the
static MFC library

and 
   add_library( ${project_name}  SHARED ${_files} )



Additional Information: 
the result in the vcxproj is:

subsystemconsole/subsystem

At VS2008 we have something like:
AdditionalOptions= /machine:X86 /debug /swaprun:net /LIBPATH:E:/DitecLibs/Lib
nafxcwd.lib /SUBSYSTEM:WINDOWS

and that works fine.

I think the parser somehow ignores the SUBSYSTEM command. Is that the point?
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-07-31 08:02 Soeren FreudigerNew 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


Re: [cmake-developers] Introducing the ${Foo_TARGETS} variable (IntroduceTARGETSVariable branch)

2013-07-31 Thread Brad King
On 07/31/2013 06:44 AM, Stephen Kelly wrote:
 Note that even in KDE there isn't consensus on whether to rely on this in 
 the non-short term:
 
  http://thread.gmane.org/gmane.comp.kde.devel.core/80233/focus=80241
 
 I don't see any particular reason to get it into 2.8.12. From the KDE 
 perspective, I think it would be more useful to get a CMake version with 
 ALIAS targets and double-colons-means-IMPORTED.
 
 My preference is for 2.8.12 to be out soon and get those features into 
 2.8.13. 

I agree.  Several of Steve's topics are more mature than the
one proposed here and he's waiting until after 2.8.12 for them.

 When do you want to create 2.8.12 RC1?

As soon as things are polished up on the dashboard and we have
time to initiate the RC cycle.  Hopefully early next week.

-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


Re: [cmake-developers] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Brad King
On 07/31/2013 07:53 AM, Stephen Kelly wrote:
 I think two things are being confused here. One is the DESTINATION for 
 things that are installed by the current command. Eg:
 
  install(TARGETS foo 
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
  )
  install(FILES foo.h 
DESTINATION include
  )
 
 The bug report is about adding genex support to those destinations.

Yes, it's also the one that started this thread.  Do we agree that
full generate-time evaluation is appropriate for these?  If so then
the implementation will require BUILD_TYPE conditional blocks in
generated cmake_install.cmake files.

 I propose that we deal with what you describe above after 2.8.12.

Yes, definately.

 For supporting generator expressions in 
 
  install(TARGETS foo 
INCLUDES DESTINATION include
  )
 
 I've pushed a INCLUDES-DESTINATION-partial-eval topic to my clone with some 
 ideas for it. Please let me know what you think.

Are you proposing this for inclusion in 2.8.12?  IMO it can
wait along with the rest.

I forgot, which config-related generator expressions on imported
targets honor MAP_IMPORTED_CONFIG_CONFIG?

What is the behavior when a not-allowed expression like
STREQUAL is used?  Does it produce an error message?

-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


Re: [cmake-developers] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Stephen Kelly
Brad King wrote:

 I've pushed a INCLUDES-DESTINATION-partial-eval topic to my clone with
 some ideas for it. Please let me know what you think.
 
 Are you proposing this for inclusion in 2.8.12?

Yes.

 IMO it can wait along with the rest.

As INCLUDES DESTINATION is already in master, that would be a behavior 
change, and probably need a policy. Currently if you use 

 install(TARGETS foo EXPORT fooTargets 
   INCLUDES DESTINATION $INSTALL_PREFIX/include/$STREQUAL:foo,bar
 )

the result in fooTargets.cmake is 

 INTERFACE_INCLUDE_DIRECTORIES
   ${_IMPORT_PREFIX}/include/$STREQUAL:foo,bar

if the genex is evaluated at export time in a follow-up release, the result 
would instead be

 INTERFACE_INCLUDE_DIRECTORIES
   ${_IMPORT_PREFIX}/include/0
 

So, I think for the case of INCLUDES DESTINATION, we can either decide and 
fix it now, or revert the change adding it for 2.8.12.

 
 I forgot, which config-related generator expressions on imported
 targets honor MAP_IMPORTED_CONFIG_CONFIG?

The $CONFIG:cfg expression should always process those, if used on any of 
the target properties used for the interface.

 
 What is the behavior when a not-allowed expression like
 STREQUAL is used?  Does it produce an error message?

In master the STREQUAL is reproduced verbatim. In my topic it is evaluated 
at export time. 

Thanks,

Steve.


--

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] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Stephen Kelly
Brad King wrote:

 The bug report is about adding genex support to those destinations.
 
 Yes, it's also the one that started this thread.  Do we agree that
 full generate-time evaluation is appropriate for these?  If so then
 the implementation will require BUILD_TYPE conditional blocks in
 generated cmake_install.cmake files.

I don't know yet. I haven't looked into the generated cmake_install.cmake 
files.

Thanks,

Steve.


--

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] target_include_directories and empty lists

2013-07-31 Thread Brad King
On 07/31/2013 09:17 AM, Stephen Kelly wrote:
 On 07/31/2013 03:13 PM, Brad King wrote:
 On 07/31/2013 09:11 AM, Stephen Kelly wrote:
 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=452e58525bb1656df0a169c8a047c25837caa4cf
 [snip]
 Docs: Document that target property commands require at least one item.
 [snip]
 -  INTERFACE|PUBLIC|PRIVATE [items1...]\n
 +  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
 What is wrong with an empty list of items?
 
 I didn't see any reason not to be 'strict'.

The use case in issue 14325 is very common and IMO expected behavior.
In fact throughout the reviews I assumed this was allowed based not
only on the documentation but what I thought we intended.  What about
the tll() version?

 Changing that behavior is something I'd recommend deferring to after
 2.8.12 if you want to change it. I don't feel extremely strongly about
 keeping it strict.

How intrusive is the change?  I don't want to make people wait for
2.8.13 just to avoid creating conditions like

 if(mylist)
   target_include_directories(... PUBLIC ${mylist})
 endif()

They will end up being pervasive in code examples and stick around
far longer than we expect.  Just look at the use of the ancient
and completely unnecessary ARGS parameter to add_custom_command.

-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


Re: [cmake-developers] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Brad King
On 07/31/2013 09:25 AM, Stephen Kelly wrote:
 As INCLUDES DESTINATION is already in master, that would be a behavior 
 change, and probably need a policy.

Technically that will be true for the real DESTINATION values too
but I doubt anyone has installed to a path with $ in it.  Since
INCLUDES DESTINATION populates a property that supports generator
expressions they are likely to be used.  I see your point.

 So, I think for the case of INCLUDES DESTINATION, we can either decide and 
 fix it now, or revert the change adding it for 2.8.12.

Let's try to decide now and revert as a last resort.

So the only reason we need partial evaluation is to leave
configuration-dependent sub-expressions untouched since the
configuration is not known until generation of the consumer?

I think the partial evaluation should work by traversing
the expression tree and collapsing sub-tree that does not
depend on the configuration into a leaf node with a constant
value.

Alternatively we could generate an error if any config-dependent
expressions are found in INCLUDES DESTINATION and otherwise
do full evaluation.  That way we can decide on the partial
evaluation semantics later.

-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


Re: [cmake-developers] target_include_directories and empty lists

2013-07-31 Thread Stephen Kelly
Brad King wrote:
 What about the tll() version?

 target_link_libraries(foo PRIVATE )

seems to not be an error with master already.

 
 Changing that behavior is something I'd recommend deferring to after
 2.8.12 if you want to change it. I don't feel extremely strongly about
 keeping it strict.
 
 How intrusive is the change?

It might be as simple as 

diff --git a/Source/cmTargetPropCommandBase.cxx 
b/Source/cmTargetPropCommandBase.cxx
index 287ce46..37aa604 100644
--- a/Source/cmTargetPropCommandBase.cxx
+++ b/Source/cmTargetPropCommandBase.cxx
@@ -19,7 +19,7 @@ bool cmTargetPropCommandBase
 ::HandleArguments(std::vectorstd::string const args, const char *prop,
  ArgumentFlags flags)
 {
-  if(args.size()  3)
+  if(args.size()  2)
 {
 this-SetError(called with incorrect number of arguments);
 return false;
@@ -53,7 +53,7 @@ bool cmTargetPropCommandBase
 
   if ((flags  PROCESS_SYSTEM)  args[argIndex] == SYSTEM)
 {
-if (args.size()  4)
+if (args.size()  3)
   {
   this-SetError(called with incorrect number of arguments);
   return false;
@@ -65,7 +65,7 @@ bool cmTargetPropCommandBase
   bool prepend = false;
   if ((flags  PROCESS_BEFORE)  args[argIndex] == BEFORE)
 {
-if (args.size()  4)
+if (args.size()  3)
   {
   this-SetError(called with incorrect number of arguments);
   return false;



... but I haven't tried most of the arg combinations.


 I don't want to make people wait for
 2.8.13 just to avoid creating conditions like
 
  if(mylist)
target_include_directories(... PUBLIC ${mylist})
  endif()
 

Ok, I'll add a test for the above patch and submit that.

Thanks,

Steve.



--

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] FindBacktrace.cmake

2013-07-31 Thread Brad King
On 07/29/2013 12:38 PM, Vadim Zhukov wrote:
 2013/7/29 Brad King brad.k...@kitware.com:
 Let's complete the add-cmake_reset_check_state topic first and
 then you can rebase the find_backtrace topic on it to use the
 feature.  The former looks good but we'll let it run through the
 dashboards tonight first.
 
 Thank you for looking in. I'll follow this plan then.

The dependency is now in master so please rebase find_backtrace
on that so you can use the reset feature.

Thanks,
-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


Re: [cmake-developers] target_include_directories and empty lists

2013-07-31 Thread Brad King
On 07/31/2013 10:01 AM, Stephen Kelly wrote:
 Ok, I'll add a test for the above patch and submit that.

Great, thanks!

-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


Re: [cmake-developers] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Stephen Kelly
Brad King wrote:
 So, I think for the case of INCLUDES DESTINATION, we can either decide
 and fix it now, or revert the change adding it for 2.8.12.
 
 Let's try to decide now and revert as a last resort.
 
 So the only reason we need partial evaluation is to leave
 configuration-dependent sub-expressions untouched since the
 configuration is not known until generation of the consumer?

Yes, I think that is the case. 

Includes are not generally different files for debug/release as the 
preprocessor is generally used instead where needed. However, let's assume 
that for the debug config we install a foo_debug.h, and otherwise not.

To get more concrete, here's some cases I could think of:

A) I want to install all includes to 

 set(config_suffix $$CONFIG:Debug:debug$NOT:$CONFIG:Debug:release)

 INCLUDES DESTINATION $INSTALL_PREFIX/include/${config_suffix}

and for consumers of the target to get either the 'debug' or the 'release' 
include directory.

I would use 

 install(FILES ${files} 
   DESTINATION include/${config_suffix})

(when that works) to install the files.

B) I only want to install the foo_debug.h to a special location

 install(FILES ${files} 
   DESTINATION include)
 install(FILES foo_debug.h 
   DESTINATION include/debug
   CONFIGURATIONS Debug
 )

 INCLUDES DESTINATION 
   include;$$CONFIG:Debug:$INSTALL_PREFIX/include/debug

So that consumers get both include directories. This probably works already 
with master.

C) As B, but with target-named include paths

 install(FILES ${foo_files} 
   DESTINATION include/foo)
 install(FILES ${bar_files} 
   DESTINATION include/bar)
 install(FILES foo_debug.h 
   DESTINATION include/foo/debug
   CONFIGURATIONS Debug
 )

 set(basic_path $INSTALL_PREFIX/include/$TARGET_PROPERTY:NAME)
 INCLUDES DESTINATION 
   ${basic_path}
   $$CONFIG:Debug:${basic_path}/debug

This does not work with master. However, there is a workaround.

 target_include_directories(foo INTERFACE 
   include/foo
   $$CONFIG:Debug:$INSTALL_PREFIX/include/foo/debug
 )

ie, not using the INCLUDES DESTINATION feature, which is 'just' a 
convenience for the 'common case'.


 I think the partial evaluation should work by traversing
 the expression tree and collapsing sub-tree that does not
 depend on the configuration into a leaf node with a constant
 value.
 
 Alternatively we could generate an error if any config-dependent
 expressions are found in INCLUDES DESTINATION and otherwise
 do full evaluation.  That way we can decide on the partial
 evaluation semantics later.

Yes, such an error would be quite easy to generate, as that fact is already 
recorded. I considered that and decided not to implement it because the bug 
report specifically wanted config support. However, that was for libraries, 
not includes. Config sensitive dirs are likely more common for libraries 
than includes, so actually I think it would be fine to make that an error 
and always do full evaluation.

I've pushed INCLUDES-DESTINATION-no-config to my clone with an 
implementation. Can I merge it to next?

Thanks,

Steve.




--

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] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Brad King
On 07/31/2013 11:05 AM, Stephen Kelly wrote:
 Config sensitive dirs are likely more common for libraries 
 than includes, so actually I think it would be fine to make that an error 
 and always do full evaluation.

To clarify, the no-config rule is for INCLUDES DESTINATION only, but full
with-config evaluation will be allowed for a real DESTINATION.  The
config can be honored for file destinations.  For targets we generate
a per-config IMPORTED_LOCATION_CONFIG anyway.  We will wait for after
2.8.12 for the file destination generator expressions.

 I've pushed INCLUDES-DESTINATION-no-config to my clone with an 
 implementation. Can I merge it to next?

Yes, but one comment first:

+  if (cge-GetHadContextSensitiveCondition())
+{
+cmMakefile* mf = target-GetMakefile();
+cmOStringStream e;
+e  Target \  target-GetName()  \ is installed with 
+INCLUDES DESTINATION set to a configuration sensitive path.  This is 

Does context sensitive condition ever mean something other than
configuration sensitive?  If so then users may produce a case that
triggers this error in a confusing manner.

-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


Re: [cmake-developers] [CMake 0014317]: Configuration dependent install EXPORT

2013-07-31 Thread Stephen Kelly
Brad King wrote:

 On 07/31/2013 11:05 AM, Stephen Kelly wrote:
 Config sensitive dirs are likely more common for libraries
 than includes, so actually I think it would be fine to make that an error
 and always do full evaluation.
 
 To clarify, the no-config rule is for INCLUDES DESTINATION only, but full
 with-config evaluation will be allowed for a real DESTINATION.  The
 config can be honored for file destinations.  For targets we generate
 a per-config IMPORTED_LOCATION_CONFIG anyway.  We will wait for after
 2.8.12 for the file destination generator expressions.

Right.

 
 I've pushed INCLUDES-DESTINATION-no-config to my clone with an
 implementation. Can I merge it to next?
 
 Yes, but one comment first:
 
 +  if (cge-GetHadContextSensitiveCondition())
 +{
 +cmMakefile* mf = target-GetMakefile();
 +cmOStringStream e;
 +e  Target \  target-GetName()  \ is installed with 
 +INCLUDES DESTINATION set to a configuration sensitive path.  This is
 
 
 Does context sensitive condition ever mean something other than
 configuration sensitive?  If so then users may produce a case that
 triggers this error in a confusing manner.
 
Yes, is also means that TARGET_POLICY was used, or a 
LINK_INTERFACE_DEPENDENT_{BOOL,STRING} property was used in the generator 
expression.

In the case of the target policy, it makes sense to error on this because 
there is no point in changing the property based on the policy setting of 
the consumer of the IMPORTED target.

For LINK_INTERFACE_DEPENDENT_STRING properties it is a bit unfortunate, 
because we can't use the QT_MAJOR_VERSION target property and install to 
either include/Qt4Based or include/Qt5Based depending on which version we're 
installing for.

However, that is still easily possible with target_include_directories.

Thanks,

Steve.




--

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 0014327]: CMAKE_CONFIG_POSTFIX For Executables

2013-07-31 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=14327 
== 
Reported By:Ryan H. Kawicki
Assigned To:
== 
Project:CMake
Issue ID:   14327
Category:   CMake
Reproducibility:always
Severity:   feature
Priority:   normal
Status: new
== 
Date Submitted: 2013-07-31 14:32 EDT
Last Modified:  2013-07-31 14:32 EDT
== 
Summary:CMAKE_CONFIG_POSTFIX For Executables
Description: 
According to the documentation, CMAKE_CONFIG_POSTFIX does not apply
executables due to legacy reasons.  It would be nice if this also applied to
executables and then use the policy system to enforce OLD or NEW.

Steps to Reproduce: 
SET(CMAKE_DEBUG_POSTFIX D
CACHE STRING
Adds a debug postfix symbol, usually \D\ on Windows.
FORCE)

# the above does not apply to executables

SET_TARGET_PROPERTIES(${TargetProject}
  PROPERTIES
  DEBUG_POSTFIX D)

# the above applies the postfix value for executables

Additional Information: 
Something like:

CMAKE_POLICY(SET CMP0021 NEW)

would enforce the new standard of allowing CMAKE_CONFIG_POSTFIX to be applied
to that configurations executables too.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-07-31 14:32 Ryan H. KawickiNew 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 0014328]: CMAKE_NO_BUILTIN_CHRPATH and Ninja fails

2013-07-31 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=14328 
== 
Reported By:RolandSchulz
Assigned To:
== 
Project:CMake
Issue ID:   14328
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2013-07-31 15:44 EDT
Last Modified:  2013-07-31 15:44 EDT
== 
Summary:CMAKE_NO_BUILTIN_CHRPATH and Ninja fails
Description: 
Using CMAKE_NO_BUILTIN_CHRPATH together with Ninja generator fails to install
with the error message:
file INSTALL cannot find
.../CMakeFiles/CMakeRelink.dir/libgmx.so.6.

Additional Information: 
This is particularly annoying on OpenSuse, because they made
CMAKE_NO_BUILTIN_CHRPATH default. But the error is not limited to the OpenSuse
cmake binary. Setting CMAKE_NO_BUILTIN_CHRPATH also causes the problem with the
binary from the cmake website.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-07-31 15:44 RolandSchulz   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 0014329]: COMPONENT ignored when appearing after DESTINATION's

2013-07-31 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=14329 
== 
Reported By:Andreas Pakulat
Assigned To:
== 
Project:CMake
Issue ID:   14329
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2013-07-31 16:59 EDT
Last Modified:  2013-07-31 16:59 EDT
== 
Summary:COMPONENT ignored when appearing after DESTINATION's
Description: 
It seems that unlike what the documentation suggests the position of the
COMPONENT part of an install() command is not arbitrary. The attached project
shows that the generated cmake_install.cmake file has the 'Unspecified'
component set for the 'foo' target, but the expected 'applications' component
set for the 'bar' target.

The only difference between both is that the 'bar' target has COMPONENT before
the various DESTINATION entries and 'foo' has COMPONENT after them.

I tried CMake 2.8.11.2, 2.8.10 and 2.8.8 and all of them show the same incorrect
(IMO) behaviour.

Steps to Reproduce: 
1. Run cmake on the attached minimal example
2. Inspect cmake_install.cmake and verify the components used for the 'foo' and
'bar' targets respectively
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-07-31 16:59 Andreas PakulatNew Issue
2013-07-31 16:59 Andreas PakulatFile Added: cmaketestcase.tar.gz
   
==

--

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 0014330]: ExternalProject download error misleading if MD5 check is used

2013-07-31 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=14330 
== 
Reported By:RolandSchulz
Assigned To:
== 
Project:CMake
Issue ID:   14330
Category:   (No Category)
Reproducibility:always
Severity:   major
Priority:   normal
Status: new
== 
Date Submitted: 2013-07-31 17:39 EDT
Last Modified:  2013-07-31 17:39 EDT
== 
Summary:ExternalProject download error misleading if MD5
check is used
Description: 
If one uses ExternalProject with MD5 check and the download doesn't work (e.g.
no internet connection), then the error message is  misleading. It states that
the MD5 checksum is incorrect, instead of e.g. unknown host, as it would
without the MD5 check enabled. This is because the MD5 sum is checked in the
file(DOWNLOAD ..) before the error code of the download is checked. Thus the
wrong (/less important) error is shown.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-07-31 17:39 RolandSchulz   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] support for .f03/.F03 suffix (Fortran 2003)

2013-07-31 Thread Radovan Bast
dear all,

it seems that CMake currently does not support .f03/.F03 suffix
for Fortran 2003 files.

is there a way for me to tell CMake to treat these files as it would treat
files ending with .f90 or .f95. i can then assign special flags to them via
source file
properties.

thank you in advance  best regards,
  radovan
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

[CMake] Re-running automoc all the time after #13494

2013-07-31 Thread Jan Kundrát

Hi folks,
I am using out-of-tree builds with Trojita [1], a Qt application. My cmake 
version is 2.8.10.2 on Gentoo Linux using the default Makefile generator and 
GNU make.

Some of my .cpp files #include ui_something.h, which are generated by moc. 
Other files are imported from 3rd party projects and directly include moc_*.cpp. In order 
to make this work, my code calls:

 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 set(CMAKE_AUTOMOC True)

However, it looks that due to a fix for #13494 [2], moc gets re-run whenever I run 
`make`. The build system is apparently smart enough to not re-link everything, but it 
nonetheless takes at least 3.5 seconds of real time when using non-parallel builds (and 
1.7 seconds when building with -j6, which I sometimes cannot use because I have 
only 4GB of RAM on this machine, Thinkpad T420s with i5-2520M and an Intel 
SSD).

I guess what I'm looking for is a way of telling cmake to add 
-I${CMAKE_CURRENT_BINARY_DIR} only when calling the actual compiler, not moc. 
Is that possible? Or shall I do it some other way?

I guess that I could probably split the static library I'm building into two 
units, one for the generated files and the other for actual sources, and set 
the include directory only when building the second library (via 
target-specific properties). I'm not sure how easy it is to persuade automoc to 
work in such a setup, though.

Another annoyance is that I want to support cmake 2.8.7 as well (that's what 
gets shipped with Ubuntu 12.04 LTS) which does not support target-specific 
includes. My cmake setup is annoyingly complicated due to this requirement 
already, and I'd like to keep it in a maintaineable state :). General comments 
on the readability of the existing cmake setup are much appreciated as well -- 
perhaps I'm doing something in a completely wrong way, after all.

With kind regards,
Jan

[1] 
http://quickgit.kde.org/?p=trojita.gita=blobh=4ac8397d028bec11e636affc72c2c014e8b8e756hb=b870be05017674781bc52c48934c9800a6329493f=CMakeLists.txt
[2] http://public.kitware.com/Bug/view.php?id=13494

--
Trojitá, a fast Qt IMAP e-mail client -- http://trojita.flaska.net/
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

Re: [CMake] starting cpack and select the generator for CPACK

2013-07-31 Thread ycollette . nospam
Thanks, it works fine for the packaging.
And thanks too for the ant link. I think I will switch to the ant exec task.

Best regards,

YC

- Mail original -
De: Eric Noulard eric.noul...@gmail.com
À: Yann COLLETTE ycollette.nos...@free.fr
Cc: cmake cmake@cmake.org
Envoyé: Mercredi 31 Juillet 2013 17:19:17
Objet: Re: [CMake] starting cpack and select the generator for CPACK

2013/7/31  ycollette.nos...@free.fr:
 hello,

 I would like to start cpack using the cmake command.
 For example, to start the test using cmake, I found the following command:

 cd ${CMAKE_BINARY_DIR}
 cmake --build . --target test

 I think
 cd ${CMAKE_BINARY_DIR}
 cmake --build . --target package

 should work, but I don't know how to specify the generator (ZIP or DEB for 
 example).

I guess that in this case you'll have to choose the CPack generator to
be used when
configuring the build tree with CMake initially.

i.e.

cd ${CMAKE_BINARY_DIR}
cmake -D CPACK_GENERATOR=ZIP;DEB /path/to/source

then
cmake --build . --target package

will build ZIP and DEB.

or...

 The same question applied to ctest: how can I pass some options like '-R 
 Python' using the cmake command.

 My constraint is that I must use ant to launch cmake (and the cmake plugin 
 seems to only know the cmake command. Neither ctest nor cpack).

You may teach CMake ant task to learn about cpack and ctest command.
or use the generic Exec task:
http://ant.apache.org/manual/Tasks/exec.html


-- 
Erk
L'élection n'est pas la démocratie -- http://www.le-message.org
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

Re: [CMake] CPack: Ignoring files using regex

2013-07-31 Thread Glenn Coombs
The regexp you're using matches anything where the last character at the
end of the line isn't one of the characters inside the square brackets.  I
don't think cmake's regexps allow negation of words so specifying a regexp
that matches everything except projectA/, README and CMakelists.txt is
going to be tricky.

You could just list the known items that you do want to ignore.  Something
like this:

set(CPACK_SOURCE_IGNORE_FILES /build/;/extrafiles/;/temp/)

will hopefully ignore directories called build, extrafiles and temp.  It
isn't exactly what you want but might help.

On 29 July 2013 19:40, Chris Wood c.c.w...@gmail.com wrote:

 I'm trying to get my head round CMake's regex implementation; I have a
 folder containing 4 folder and 2 text files:

 build/
 projectA/
 CMakeLists.txt
 extrafiles/
 README
 temp/

 one line of CMakeLists.txt is:

 set(CPACK_SOURCE_IGNORE_FILES [^projectA]$)

 in my source package that is ten subsequently generated, `build/`
 `projectA/` and `extrafiles` are present, but `temp/` and the 2 text
 files are not. I'm trying to get to a stage where the regex will
 ignore everything in the folder except for `projectA/`, `README` and
 `CMakeLists.txt`, but can't work out at the moment how the regex I've
 supplied is giving those results.

 Any insight will be greatly appreciated!

 Chris
 --

 Powered by www.kitware.com

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

 Kitware offers various services to support the CMake community. For more
 information on each offering, please visit:

 CMake Support: http://cmake.org/cmake/help/support.html
 CMake Consulting: http://cmake.org/cmake/help/consulting.html
 CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

Re: [CMake] Debug problem with component install

2013-07-31 Thread Andreas Pakulat
Hi,

On Sat, Jul 27, 2013 at 12:39 AM, Andreas Pakulat ap...@gmx.de wrote:

 Hi,

 I'm having a project here where cmake refuses to recognize the COMPONENT
 option for the install() command for certain targets.

 Within the project there are several subdirs, the top-level CMakeLists.txt
 has a component-install rule like this:

 INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/html DESTINATION
 share/doc/myapp COMPONENT documentation)

 which generates the expected output in the cmake_install.cmake file.
 However several subdirectories contain executable targets for which the
 cmake_install.cmake file uses the Unspecified component. The executable
 target files look like this:

 SET(SOURCES
 main.cpp object.cpp)

 SET(MOCABLES
 object.h)

 QT4_WRAP_CPP(MOC_SOURCES ${MOCABLES})

 ADD_EXECUTABLE(myapp ${SOURCES} ${MOC_SOURCES})
 TARGET_LINK_LIBRARIES(myapp ${QT_LIBRARIES})

 # Installation
 INSTALL(TARGETS myapp RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
COMPONENT applications)

 I can't seem to find a reason for this misbehaviour using cmake --trace or
 cmake --debug-output. Are there any other ways (short of patching +
 compiling cmake) to find out what goes wrong here? And if not, can someone
 give me a hint where to start patching?

 I'm using cmake 2.8.11.2 on Debian/GNU Linux.

 In a very small example with just an executable target in a single cmake
 file everything works fine, but minimizing the real codebase is quite a bit
 harder than I thought.


It seems that the issue is that I'm listing 'COMPONENT' after the various
destinations. This seems to confuse the parsing of the arguments in
cmInstallCommand, as the genericArgs in ::HandleTargetsMode always yields
'Unspecified' unless I move COMPONENT before the DESTINATIONS.

The cmake docs do not indicate any importance on the order, but I finally
have a minimal testcase and can file a bugreport.

Andreas
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

Re: [CMake] support for .f03/.F03 suffix (Fortran 2003)

2013-07-31 Thread Zaak Beekman
 dear all,

 it seems that CMake currently does not support .f03/.F03 suffix
 for Fortran 2003 files.

 is there a way for me to tell CMake to treat these files as it would treat
 files ending with .f90 or .f95. i can then assign special flags to them via
 source file
 properties.

 thank you in advance  best regards,
   radovan


Radovan,
I'm curious why you want to use .f03 or .f08 extensions. Some
compilers--like Intel's--explicitly forbid this. For portability I would
recommend sticking with the .f90 suffix.

I suspect you can adjust the following variable to implement a work around,
although I am a CMake newbie and have not tried it myself:
CMAKE_Fortran_SOURCE_FILE_EXTENSIONS [
http://www.cmake.org/cmake/help/v2.8.8/cmake.html#variable:CMAKE_LANG_SOURCE_FILE_EXTENSIONS
]
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

Re: [CMake] Debug problem with component install

2013-07-31 Thread Andreas Pakulat
Hi,

On Wed, Jul 31, 2013 at 10:52 PM, Eric Noulard eric.noul...@gmail.comwrote:

 2013/7/31 Andreas Pakulat ap...@gmx.de:
  Hi,
 
  On Sat, Jul 27, 2013 at 12:39 AM, Andreas Pakulat ap...@gmx.de wrote:
 
  Hi,
 
  I'm having a project here where cmake refuses to recognize the
 COMPONENT
  option for the install() command for certain targets.
 
  Within the project there are several subdirs, the top-level
 CMakeLists.txt
  has a component-install rule like this:
 
  INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/html DESTINATION
  share/doc/myapp COMPONENT documentation)
 
  which generates the expected output in the cmake_install.cmake file.
  However several subdirectories contain executable targets for which the
  cmake_install.cmake file uses the Unspecified component. The
 executable
  target files look like this:
 
  SET(SOURCES
  main.cpp object.cpp)
 
  SET(MOCABLES
  object.h)
 
  QT4_WRAP_CPP(MOC_SOURCES ${MOCABLES})
 
  ADD_EXECUTABLE(myapp ${SOURCES} ${MOC_SOURCES})
  TARGET_LINK_LIBRARIES(myapp ${QT_LIBRARIES})
 
  # Installation
  INSTALL(TARGETS myapp RUNTIME DESTINATION bin
 ARCHIVE DESTINATION lib
 LIBRARY DESTINATION lib
 COMPONENT applications)
 
  I can't seem to find a reason for this misbehaviour using cmake --trace
 or
  cmake --debug-output. Are there any other ways (short of patching +
  compiling cmake) to find out what goes wrong here? And if not, can
 someone
  give me a hint where to start patching?
 
  I'm using cmake 2.8.11.2 on Debian/GNU Linux.
 
  In a very small example with just an executable target in a single cmake
  file everything works fine, but minimizing the real codebase is quite a
 bit
  harder than I thought.
 
 
  It seems that the issue is that I'm listing 'COMPONENT' after the various
  destinations. This seems to confuse the parsing of the arguments in
  cmInstallCommand, as the genericArgs in ::HandleTargetsMode always yields
  'Unspecified' unless I move COMPONENT before the DESTINATIONS.

 I'm not sure to fully understand your testcase but
 the keywords specified after ARCHIVE|LIBRARY|RUNTIME|FRAMEWORK|BUNDLE|
PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE

 should be repeated for each of them.

 i.e. one shall not write
 INSTALL(TARGETS myapp
 RUNTIME DESTINATION bin
 ARCHIVE DESTINATION lib
 LIBRARY DESTINATION lib
 COMPONENT applications)

 but
 INSTALL(TARGETS myapp
 RUNTIME DESTINATION bin COMPONENT applications
 ARCHIVE DESTINATION lib COMPONENT applications
 LIBRARY DESTINATION lib COMPONENT applications)

 I.e COMPONENT should be repeated just as DESTINATION is.

  The cmake docs do not indicate any importance on the order, but I finally
  have a minimal testcase and can file a bugreport.

 I don't think the doc is wrong but the nested bracket level [[[ ]]]
 makes it confusing to understand.


Ugh, you're right and yes the brackets really don't help in understanding
this. Well
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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

Re: [CMake] Debug problem with component install

2013-07-31 Thread Eric Noulard
2013/7/31 Andreas Pakulat ap...@gmx.de:
 Hi,

 On Sat, Jul 27, 2013 at 12:39 AM, Andreas Pakulat ap...@gmx.de wrote:

 Hi,

 I'm having a project here where cmake refuses to recognize the COMPONENT
 option for the install() command for certain targets.

 Within the project there are several subdirs, the top-level CMakeLists.txt
 has a component-install rule like this:

 INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/html DESTINATION
 share/doc/myapp COMPONENT documentation)

 which generates the expected output in the cmake_install.cmake file.
 However several subdirectories contain executable targets for which the
 cmake_install.cmake file uses the Unspecified component. The executable
 target files look like this:

 SET(SOURCES
 main.cpp object.cpp)

 SET(MOCABLES
 object.h)

 QT4_WRAP_CPP(MOC_SOURCES ${MOCABLES})

 ADD_EXECUTABLE(myapp ${SOURCES} ${MOC_SOURCES})
 TARGET_LINK_LIBRARIES(myapp ${QT_LIBRARIES})

 # Installation
 INSTALL(TARGETS myapp RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
COMPONENT applications)

 I can't seem to find a reason for this misbehaviour using cmake --trace or
 cmake --debug-output. Are there any other ways (short of patching +
 compiling cmake) to find out what goes wrong here? And if not, can someone
 give me a hint where to start patching?

 I'm using cmake 2.8.11.2 on Debian/GNU Linux.

 In a very small example with just an executable target in a single cmake
 file everything works fine, but minimizing the real codebase is quite a bit
 harder than I thought.


 It seems that the issue is that I'm listing 'COMPONENT' after the various
 destinations. This seems to confuse the parsing of the arguments in
 cmInstallCommand, as the genericArgs in ::HandleTargetsMode always yields
 'Unspecified' unless I move COMPONENT before the DESTINATIONS.

I'm not sure to fully understand your testcase but
the keywords specified after ARCHIVE|LIBRARY|RUNTIME|FRAMEWORK|BUNDLE|
   PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE

should be repeated for each of them.

i.e. one shall not write
INSTALL(TARGETS myapp
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
COMPONENT applications)

but
INSTALL(TARGETS myapp
RUNTIME DESTINATION bin COMPONENT applications
ARCHIVE DESTINATION lib COMPONENT applications
LIBRARY DESTINATION lib COMPONENT applications)

I.e COMPONENT should be repeated just as DESTINATION is.

 The cmake docs do not indicate any importance on the order, but I finally
 have a minimal testcase and can file a bugreport.

I don't think the doc is wrong but the nested bracket level [[[ ]]]
makes it confusing to understand.


-- 
Erk
L'élection n'est pas la démocratie -- http://www.le-message.org
--

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

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


[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3504-g97bd7a8

2013-07-31 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  97bd7a8ba4a45727aab5f1046189ec1182128515 (commit)
   via  fbed829beaad4b9757662497c1a91391c4066015 (commit)
  from  9af30f931888bfc140dec76149ced5eb36d6b0da (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=97bd7a8ba4a45727aab5f1046189ec1182128515
commit 97bd7a8ba4a45727aab5f1046189ec1182128515
Merge: 9af30f9 fbed829
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:02:00 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:02:00 2013 -0400

Merge topic 'update-libarchive' into next

fbed829 libarchive: Convert CRLF - LF newlines


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbed829beaad4b9757662497c1a91391c4066015
commit fbed829beaad4b9757662497c1a91391c4066015
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 07:57:42 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 31 07:57:42 2013 -0400

libarchive: Convert CRLF - LF newlines

diff --git a/Utilities/cmlibarchive/build/cmake/FindLibGCC.cmake 
b/Utilities/cmlibarchive/build/cmake/FindLibGCC.cmake
index 5883ff8..7985f2b 100644
--- a/Utilities/cmlibarchive/build/cmake/FindLibGCC.cmake
+++ b/Utilities/cmlibarchive/build/cmake/FindLibGCC.cmake
@@ -1,22 +1,22 @@
-# - Find libgcc
-# Find the libgcc library.
-#
-#  LIBGCC_LIBRARIES  - List of libraries when using libgcc
-#  LIBGCC_FOUND  - True if libgcc found.
-
-IF (LIBGCC_LIBRARY)
-  # Already in cache, be silent
-  SET(LIBGCC_FIND_QUIETLY TRUE)
-ENDIF (LIBGCC_LIBRARY)
-
-FIND_LIBRARY(LIBGCC_LIBRARY NAMES gcc libgcc)
-
-# handle the QUIETLY and REQUIRED arguments and set LIBGCC_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGCC DEFAULT_MSG LIBGCC_LIBRARY)
-
-IF(LIBGCC_FOUND)
-  SET(LIBGCC_LIBRARIES ${LIBGCC_LIBRARY})
-  SET(HAVE_LIBGCC 1)
-ENDIF(LIBGCC_FOUND)
+# - Find libgcc
+# Find the libgcc library.
+#
+#  LIBGCC_LIBRARIES  - List of libraries when using libgcc
+#  LIBGCC_FOUND  - True if libgcc found.
+
+IF (LIBGCC_LIBRARY)
+  # Already in cache, be silent
+  SET(LIBGCC_FIND_QUIETLY TRUE)
+ENDIF (LIBGCC_LIBRARY)
+
+FIND_LIBRARY(LIBGCC_LIBRARY NAMES gcc libgcc)
+
+# handle the QUIETLY and REQUIRED arguments and set LIBGCC_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGCC DEFAULT_MSG LIBGCC_LIBRARY)
+
+IF(LIBGCC_FOUND)
+  SET(LIBGCC_LIBRARIES ${LIBGCC_LIBRARY})
+  SET(HAVE_LIBGCC 1)
+ENDIF(LIBGCC_FOUND)
diff --git a/Utilities/cmlibarchive/build/cmake/FindNettle.cmake 
b/Utilities/cmlibarchive/build/cmake/FindNettle.cmake
index 54ec9f5..1f66610 100644
--- a/Utilities/cmlibarchive/build/cmake/FindNettle.cmake
+++ b/Utilities/cmlibarchive/build/cmake/FindNettle.cmake
@@ -1,23 +1,23 @@
-# - Find Nettle
-# Find the Nettle include directory and library
-#
-#  NETTLE_INCLUDE_DIR- where to find nettle/sha.h, etc.
-#  NETTLE_LIBRARIES  - List of libraries when using libnettle.
-#  NETTLE_FOUND  - True if libnettle found.
-
-IF (NETTLE_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(NETTLE_FIND_QUIETLY TRUE)
-ENDIF (NETTLE_INCLUDE_DIR)
-
-FIND_PATH(NETTLE_INCLUDE_DIR nettle/md5.h nettle/ripemd160.h nettle/sha.h)
-FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle libnettle)
-
-# handle the QUIETLY and REQUIRED arguments and set NETTLE_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETTLE DEFAULT_MSG NETTLE_LIBRARY 
NETTLE_INCLUDE_DIR)
-
-IF(NETTLE_FOUND)
-  SET(NETTLE_LIBRARIES ${NETTLE_LIBRARY})
-ENDIF(NETTLE_FOUND)
+# - Find Nettle
+# Find the Nettle include directory and library
+#
+#  NETTLE_INCLUDE_DIR- where to find nettle/sha.h, etc.
+#  NETTLE_LIBRARIES  - List of libraries when using libnettle.
+#  NETTLE_FOUND  - True if libnettle found.
+
+IF (NETTLE_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(NETTLE_FIND_QUIETLY TRUE)
+ENDIF (NETTLE_INCLUDE_DIR)
+
+FIND_PATH(NETTLE_INCLUDE_DIR nettle/md5.h nettle/ripemd160.h nettle/sha.h)
+FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle libnettle)
+
+# handle the QUIETLY and REQUIRED arguments and set NETTLE_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETTLE DEFAULT_MSG NETTLE_LIBRARY 
NETTLE_INCLUDE_DIR)
+
+IF(NETTLE_FOUND)
+  SET(NETTLE_LIBRARIES ${NETTLE_LIBRARY})
+ENDIF(NETTLE_FOUND)
diff --git 

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3506-gb11ce2c

2013-07-31 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  b11ce2cc030b4a59a9a4dfc75d91fb21ac068367 (commit)
   via  4056e88c13cd092fd08cccf805712d2773025186 (commit)
  from  97bd7a8ba4a45727aab5f1046189ec1182128515 (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=b11ce2cc030b4a59a9a4dfc75d91fb21ac068367
commit b11ce2cc030b4a59a9a4dfc75d91fb21ac068367
Merge: 97bd7a8 4056e88
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:26:22 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:26:22 2013 -0400

Merge topic 'update-libarchive' into next

4056e88 libarchive: Update README for new upstream snapshot commit hash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4056e88c13cd092fd08cccf805712d2773025186
commit 4056e88c13cd092fd08cccf805712d2773025186
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:23:44 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 31 08:23:44 2013 -0400

libarchive: Update README for new upstream snapshot commit hash

diff --git a/Utilities/cmlibarchive/README-CMake.txt 
b/Utilities/cmlibarchive/README-CMake.txt
index d43bbd6..ab105f0 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
 Update libarchive from upstream as follows.  Create a local branch to
 explicitly reference the upstream snapshot branch head:
 
- git branch libarchive-upstream 0ce42049
+ git branch libarchive-upstream 35df7c8b
 
 Use a temporary directory to checkout the branch:
 
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
 Now place the (reduced) libarchive content in this directory.  See
 instructions shown by
 
- git log 0ce42049
+ git log 35df7c8b
 
 for help extracting the content from the upstream svn repo.  Then run
 the following commands to commit the new version.  Substitute the

---

Summary of changes:
 Utilities/cmlibarchive/README-CMake.txt |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.11.2-3522-gf717142

2013-07-31 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  f717142ce5db3ca731707606781266cb3878887a (commit)
   via  33e6e0b9c2ae26c8d077e577ded49debb75d1070 (commit)
   via  152dfdab11f66f4675c7f9af1cff6d301b1e271a (commit)
   via  20ed496b6d98bd2e28c2657c3383dd0cdbae9f4d (commit)
   via  54f7019fd06d2aaabeb24f6f5b0379e574cb9fb8 (commit)
   via  2a43c306fe434b87b087586c2e45d3e1fbe56d33 (commit)
   via  14bbf8340ac4d285b61afb5b61ebc4c730f4b4fa (commit)
  from  deeb80a6cb4ded8d5ce8fe2c493d208dda975d6b (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=f717142ce5db3ca731707606781266cb3878887a
commit f717142ce5db3ca731707606781266cb3878887a
Merge: deeb80a 33e6e0b
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:42:04 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:42:04 2013 -0400

Merge topic 'static_library_flags' into next

33e6e0b VS6: Add handling of CMAKE_*_LINKER_FLAGS_CONFIG variables
152dfda Add additonal tests for the linker flags
20ed496 Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables
54f7019 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude
2a43c30 Add support for CMAKE_STATIC_LINKER_FLAGS
14bbf83 Unify the way the flags of a static library are read


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33e6e0b9c2ae26c8d077e577ded49debb75d1070
commit 33e6e0b9c2ae26c8d077e577ded49debb75d1070
Author: Patrick Gansterer par...@paroga.com
AuthorDate: Tue Jul 30 12:23:50 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 31 08:41:08 2013 -0400

VS6: Add handling of CMAKE_*_LINKER_FLAGS_CONFIG variables

Read the content of the config specific linker flags in the
Visual Studio 6 generator too.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx 
b/Source/cmLocalVisualStudio6Generator.cxx
index 5ca8aba..667d86f 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1171,18 +1171,42 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelWithDebInfo;
   if(target.GetType() == cmTarget::EXECUTABLE)
 {
-extraLinkOptions =
-  this-Makefile-GetRequiredDefinition(CMAKE_EXE_LINKER_FLAGS);
+extraLinkOptions = this-Makefile-
+  GetRequiredDefinition(CMAKE_EXE_LINKER_FLAGS);
+extraLinkOptionsDebug = this-Makefile-
+  GetRequiredDefinition(CMAKE_EXE_LINKER_FLAGS_DEBUG);
+extraLinkOptionsRelease = this-Makefile-
+  GetRequiredDefinition(CMAKE_EXE_LINKER_FLAGS_RELEASE);
+extraLinkOptionsMinSizeRel = this-Makefile-
+  GetRequiredDefinition(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL);
+extraLinkOptionsRelWithDebInfo = this-Makefile-
+  GetRequiredDefinition(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO);
 }
   if(target.GetType() == cmTarget::SHARED_LIBRARY)
 {
-extraLinkOptions =
-  this-Makefile-GetRequiredDefinition(CMAKE_SHARED_LINKER_FLAGS);
+extraLinkOptions = this-Makefile-
+  GetRequiredDefinition(CMAKE_SHARED_LINKER_FLAGS);
+extraLinkOptionsDebug = this-Makefile-
+  GetRequiredDefinition(CMAKE_SHARED_LINKER_FLAGS_DEBUG);
+extraLinkOptionsRelease = this-Makefile-
+  GetRequiredDefinition(CMAKE_SHARED_LINKER_FLAGS_RELEASE);
+extraLinkOptionsMinSizeRel = this-Makefile-
+  GetRequiredDefinition(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL);
+extraLinkOptionsRelWithDebInfo = this-Makefile-
+  GetRequiredDefinition(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO);
 }
   if(target.GetType() == cmTarget::MODULE_LIBRARY)
 {
-extraLinkOptions =
-  this-Makefile-GetRequiredDefinition(CMAKE_MODULE_LINKER_FLAGS);
+extraLinkOptions = this-Makefile-
+  GetRequiredDefinition(CMAKE_MODULE_LINKER_FLAGS);
+extraLinkOptionsDebug = this-Makefile-
+  GetRequiredDefinition(CMAKE_MODULE_LINKER_FLAGS_DEBUG);
+extraLinkOptionsRelease = this-Makefile-
+  GetRequiredDefinition(CMAKE_MODULE_LINKER_FLAGS_RELEASE);
+extraLinkOptionsMinSizeRel = this-Makefile-
+  GetRequiredDefinition(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL);
+extraLinkOptionsRelWithDebInfo = this-Makefile-
+  GetRequiredDefinition(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO);
 }
 
   // Get extra linker options for this target.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=152dfdab11f66f4675c7f9af1cff6d301b1e271a
commit 152dfdab11f66f4675c7f9af1cff6d301b1e271a
Author: Patrick Gansterer par...@paroga.com
AuthorDate: Sun Jul 28 20:34:16 2013 +0200
Commit: Brad King brad.k...@kitware.com

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3524-g1237c22

2013-07-31 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  1237c224c6aa96ab5d3773b34431e60eb01f8fef (commit)
   via  9349d69abf69795e115329475d56ff0583b6c79c (commit)
  from  f717142ce5db3ca731707606781266cb3878887a (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=1237c224c6aa96ab5d3773b34431e60eb01f8fef
commit 1237c224c6aa96ab5d3773b34431e60eb01f8fef
Merge: f717142 9349d69
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:45:26 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:45:26 2013 -0400

Merge topic 'add-cmake_reset_check_state' into next

9349d69 Add cmake_reset_check_state() macro


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9349d69abf69795e115329475d56ff0583b6c79c
commit 9349d69abf69795e115329475d56ff0583b6c79c
Author: Vadim Zhukov persg...@gmail.com
AuthorDate: Sun Jul 28 14:11:51 2013 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 31 08:43:22 2013 -0400

Add cmake_reset_check_state() macro

It's acknowledged that check state should not generally nest,
so it should be cleared when used, for example, in Find* module.

Also, add optional RESET argument to cmake_push_check_state().

diff --git a/Modules/CMakePushCheckState.cmake 
b/Modules/CMakePushCheckState.cmake
index 08809bf..b37b706 100644
--- a/Modules/CMakePushCheckState.cmake
+++ b/Modules/CMakePushCheckState.cmake
@@ -1,8 +1,10 @@
-# This module defines two macros:
+# This module defines three macros:
 # CMAKE_PUSH_CHECK_STATE()
-# and
 # CMAKE_POP_CHECK_STATE()
-# These two macros can be used to save and restore the state of the variables
+# and
+# CMAKE_RESET_CHECK_STATE()
+# These macros can be used to save, restore and reset (i.e., clear contents)
+# the state of the variables
 # CMAKE_REQUIRED_FLAGS, CMAKE_REQUIRED_DEFINITIONS, CMAKE_REQUIRED_LIBRARIES
 # and CMAKE_REQUIRED_INCLUDES used by the various Check-files coming with 
CMake,
 # like e.g. check_function_exists() etc.
@@ -11,9 +13,16 @@
 # but after the Find-module has been executed they should have the same value
 # as they had before.
 #
+# CMAKE_PUSH_CHECK_STATE() macro receives optional argument RESET. Whether 
it's specified,
+# CMAKE_PUSH_CHECK_STATE() will set all CMAKE_REQUIRED_* variables to empty 
values, same
+# as CMAKE_RESET_CHECK_STATE() call will do.
+#
 # Usage:
-#   cmake_push_check_state()
-#   set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} 
-DSOME_MORE_DEF)
+#   cmake_push_check_state(RESET)
+#   set(CMAKE_REQUIRED_DEFINITIONS -DSOME_MORE_DEF)
+#   check_function_exists(...)
+#   cmake_reset_check_state()
+#   set(CMAKE_REQUIRED_DEFINITIONS -DANOTHER_DEF)
 #   check_function_exists(...)
 #   cmake_pop_check_state()
 
@@ -31,6 +40,15 @@
 #  License text for the above reference.)
 
 
+macro(CMAKE_RESET_CHECK_STATE)
+
+   set(CMAKE_REQUIRED_INCLUDES)
+   set(CMAKE_REQUIRED_DEFINITIONS)
+   set(CMAKE_REQUIRED_LIBRARIES)
+   set(CMAKE_REQUIRED_FLAGS)
+
+endmacro()
+
 macro(CMAKE_PUSH_CHECK_STATE)
 
if(NOT DEFINED _CMAKE_PUSH_CHECK_STATE_COUNTER)
@@ -43,6 +61,11 @@ macro(CMAKE_PUSH_CHECK_STATE)
set(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} 
${CMAKE_REQUIRED_DEFINITIONS})
set(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}   
${CMAKE_REQUIRED_LIBRARIES})
set(_CMAKE_REQUIRED_FLAGS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}   
${CMAKE_REQUIRED_FLAGS})
+
+   if (ARGC GREATER 0 AND ARGV0 STREQUAL RESET)
+  cmake_reset_check_state()
+   endif()
+
 endmacro()
 
 macro(CMAKE_POP_CHECK_STATE)

---

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.11.2-640-g6e2da4a

2013-07-31 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, master has been updated
   via  6e2da4a4d3a34f62ec830720ab47d344ada73441 (commit)
   via  2b473d2eaa2d09a69fc5a4f37d24ad051d5ead9a (commit)
  from  8e475470bec1761b9ab338f495e33b145e0ff22e (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=6e2da4a4d3a34f62ec830720ab47d344ada73441
commit 6e2da4a4d3a34f62ec830720ab47d344ada73441
Merge: 8e47547 2b473d2
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:48:19 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:48:19 2013 -0400

Merge topic 'passthru'

2b473d2 Add option to use stdout/stderr of original terminal in cmake 
--build


---

Summary of changes:
 Source/cmSystemTools.cxx |8 +++-
 Source/cmSystemTools.h   |5 +++--
 Source/cmakemain.cxx |7 +--
 3 files changed, 15 insertions(+), 5 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.11.2-649-g4e3675a

2013-07-31 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, master has been updated
   via  4e3675ae916e824997c01989366408ff2107a96f (commit)
   via  d12459f79ec5270cce7d425839674a71e83617ba (commit)
  from  f2db78c120ada2a084d69abe0296709f56c5ed10 (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=4e3675ae916e824997c01989366408ff2107a96f
commit 4e3675ae916e824997c01989366408ff2107a96f
Merge: f2db78c d12459f
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:48:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:48:52 2013 -0400

Merge topic 'ninja_bad_cmcldeps_paths'

d12459f VS 6: Tell BuildDepends test to tolerate ninjadep failure


---

Summary of changes:
 Tests/BuildDepends/CMakeLists.txt |3 +++
 1 files changed, 3 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, master, updated. v2.8.11.2-644-gb728ec3

2013-07-31 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, master has been updated
   via  b728ec3c3160e26dbfb7631aebd6fa22cfe6e20f (commit)
   via  72d13ff4826ff3e120fe2d052495b0806c2a5b90 (commit)
  from  cdfeda60f605fc8ef044ae28d4209a445ca09ffd (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=b728ec3c3160e26dbfb7631aebd6fa22cfe6e20f
commit b728ec3c3160e26dbfb7631aebd6fa22cfe6e20f
Merge: cdfeda6 72d13ff
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:48:36 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:48:36 2013 -0400

Merge topic 'install-interface-includes'

72d13ff install: Remove error condition using INCLUDES DESTINATION without 
EXPORT.


---

Summary of changes:
 Source/cmInstallCommand.cxx|7 ---
 .../include_directories/RunCMakeTest.cmake |1 -
 .../TargetInterfaceIncludes-result.txt |1 -
 .../TargetInterfaceIncludes-stderr.txt |4 
 .../TargetInterfaceIncludes.cmake  |4 
 5 files changed, 0 insertions(+), 17 deletions(-)
 delete mode 100644 
Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt
 delete mode 100644 
Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
 delete mode 100644 
Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake


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.11.2-642-gcdfeda6

2013-07-31 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, master has been updated
   via  cdfeda60f605fc8ef044ae28d4209a445ca09ffd (commit)
   via  9349d69abf69795e115329475d56ff0583b6c79c (commit)
  from  6e2da4a4d3a34f62ec830720ab47d344ada73441 (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=cdfeda60f605fc8ef044ae28d4209a445ca09ffd
commit cdfeda60f605fc8ef044ae28d4209a445ca09ffd
Merge: 6e2da4a 9349d69
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:48:29 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:48:29 2013 -0400

Merge topic 'add-cmake_reset_check_state'

9349d69 Add cmake_reset_check_state() macro


---

Summary of changes:
 Modules/CMakePushCheckState.cmake |   33 -
 1 files changed, 28 insertions(+), 5 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.11.2-647-gf2db78c

2013-07-31 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, master has been updated
   via  f2db78c120ada2a084d69abe0296709f56c5ed10 (commit)
   via  f85f6a5e795e7c552944a885a1f5f978fa847433 (commit)
   via  351fd63ef5d8f24955b3e061fd43c1c9f1aa570d (commit)
  from  b728ec3c3160e26dbfb7631aebd6fa22cfe6e20f (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=f2db78c120ada2a084d69abe0296709f56c5ed10
commit f2db78c120ada2a084d69abe0296709f56c5ed10
Merge: b728ec3 f85f6a5
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:48:40 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:48:40 2013 -0400

Merge topic 'bash-completion-updates'

f85f6a5 bash-completion: Fix/improve generator names extraction
351fd63 bash-completion: Add -S,-SP options arguments completion


---

Summary of changes:
 Docs/bash-completion/cmake |8 +---
 Docs/bash-completion/cpack |4 ++--
 Docs/bash-completion/ctest |2 +-
 3 files changed, 8 insertions(+), 6 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.11.2-667-g0cecc7b

2013-07-31 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, master has been updated
   via  0cecc7b485774be084a6d5a72e743ed9893daa5d (commit)
   via  26fe7e3adfc76a733ecc74794f22d53755ac194a (commit)
   via  b81a4e1568c58d733051d9f27cd070761f264a80 (commit)
   via  3218f52f11713d28bdfedbe6eceddb8cf8502731 (commit)
   via  bae3a73ceea6163eeb6eae59dfcf838a43048831 (commit)
   via  677384017a343f1ca70342951a39302a683843a2 (commit)
   via  8dc0a9f898710215bd29fa260f790a7051dbaab2 (commit)
   via  102071f80cf4ad7aa97bf8a1618cfc6ee6689ab6 (commit)
   via  35df7c8ba8854e97bd6994c4d1143f57535ed6f2 (commit)
  from  e3b6ab92dbb51945b81896f2d2a53f31ba63ae1a (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=0cecc7b485774be084a6d5a72e743ed9893daa5d
commit 0cecc7b485774be084a6d5a72e743ed9893daa5d
Merge: e3b6ab9 26fe7e3
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:49:09 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:49:09 2013 -0400

Merge topic 'update-libarchive'

26fe7e3 libarchive: Backport to CMake 2.8.2
b81a4e1 libarchive: Remove build options not used by CMake
3218f52 libarchive: Avoid struct init with variable
bae3a73 libarchive: Silence API deprecation warnings
6773840 libarchive: Include cm_zlib.h to get zlib used by CMake
8dc0a9f libarchive: Update README-CMake.txt for new snapshot
102071f Merge branch 'libarchive-upstream' into update-libarchive
35df7c8 libarchive 3.1.2 (reduced)


---

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt  |  326 +++-
 Utilities/cmlibarchive/README-CMake.txt|8 +-
 .../cmlibarchive/build/cmake/FindLibGCC.cmake  |   22 +
 .../cmlibarchive/build/cmake/FindNettle.cmake  |   23 +
 .../cmlibarchive/build/cmake/FindPCREPOSIX.cmake   |   34 +
 Utilities/cmlibarchive/build/cmake/config.h.in |   51 +-
 .../utils/gen_archive_string_composition_h.sh  |   47 +-
 Utilities/cmlibarchive/build/version   |2 +-
 Utilities/cmlibarchive/libarchive/CMakeLists.txt   |   23 +-
 Utilities/cmlibarchive/libarchive/archive.h|  308 +++-
 Utilities/cmlibarchive/libarchive/archive_acl.c|   82 +-
 .../cmlibarchive/libarchive/archive_check_magic.c  |1 +
 .../cmlibarchive/libarchive/archive_cmdline.c  |  227 +++
 .../libarchive/archive_cmdline_private.h   |   47 +
 Utilities/cmlibarchive/libarchive/archive_crypto.c |8 +-
 Utilities/cmlibarchive/libarchive/archive_endian.h |8 +-
 Utilities/cmlibarchive/libarchive/archive_entry.3  |6 +-
 Utilities/cmlibarchive/libarchive/archive_entry.c  |   81 +-
 Utilities/cmlibarchive/libarchive/archive_entry.h  |   45 +-
 .../cmlibarchive/libarchive/archive_entry_acl.3|6 +-
 .../libarchive/archive_entry_copy_bhfi.c   |6 +-
 .../libarchive/archive_entry_link_resolver.c   |5 +-
 .../libarchive/archive_entry_linkify.3 |4 +-
 .../cmlibarchive/libarchive/archive_entry_paths.3  |4 +-
 .../cmlibarchive/libarchive/archive_entry_perms.3  |4 +-
 .../cmlibarchive/libarchive/archive_entry_stat.3   |6 +-
 .../cmlibarchive/libarchive/archive_entry_stat.c   |   10 +-
 .../cmlibarchive/libarchive/archive_entry_time.3   |6 +-
 .../cmlibarchive/libarchive/archive_getdate.c  | 1037 +++
 Utilities/cmlibarchive/libarchive/archive_match.c  | 1841 
 .../cmlibarchive/libarchive/archive_options.c  |   53 +-
 .../cmlibarchive/libarchive/archive_pathmatch.c|  459 +
 .../cmlibarchive/libarchive/archive_pathmatch.h|   52 +
 Utilities/cmlibarchive/libarchive/archive_ppmd7.c  |7 +-
 .../cmlibarchive/libarchive/archive_ppmd_private.h |4 +-
 .../cmlibarchive/libarchive/archive_private.h  |2 +
 Utilities/cmlibarchive/libarchive/archive_rb.c |   24 +-
 Utilities/cmlibarchive/libarchive/archive_read.3   |6 +-
 Utilities/cmlibarchive/libarchive/archive_read.c   |  422 -
 .../libarchive/archive_read_append_filter.c|  198 +++
 .../cmlibarchive/libarchive/archive_read_data.3|4 +-
 .../libarchive/archive_read_data_into_fd.c |2 +-
 .../cmlibarchive/libarchive/archive_read_disk.3|6 +-
 .../libarchive/archive_read_disk_entry_from_file.c |  476 --
 .../libarchive/archive_read_disk_posix.c   |  580 +--
 .../libarchive/archive_read_disk_private.h |   23 +-
 .../libarchive/archive_read_disk_windows.c |  719 ++---
 

[Cmake-commits] CMake branch, master, updated. v2.8.11.2-658-ge3b6ab9

2013-07-31 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, master has been updated
   via  e3b6ab92dbb51945b81896f2d2a53f31ba63ae1a (commit)
   via  33e6e0b9c2ae26c8d077e577ded49debb75d1070 (commit)
   via  152dfdab11f66f4675c7f9af1cff6d301b1e271a (commit)
   via  20ed496b6d98bd2e28c2657c3383dd0cdbae9f4d (commit)
   via  54f7019fd06d2aaabeb24f6f5b0379e574cb9fb8 (commit)
   via  2a43c306fe434b87b087586c2e45d3e1fbe56d33 (commit)
   via  14bbf8340ac4d285b61afb5b61ebc4c730f4b4fa (commit)
  from  58c5dc37d307c1d2a85c42e84e71cb619a6956b0 (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=e3b6ab92dbb51945b81896f2d2a53f31ba63ae1a
commit e3b6ab92dbb51945b81896f2d2a53f31ba63ae1a
Merge: 58c5dc3 33e6e0b
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:49:01 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:49:01 2013 -0400

Merge topic 'static_library_flags'

33e6e0b VS6: Add handling of CMAKE_*_LINKER_FLAGS_CONFIG variables
152dfda Add additonal tests for the linker flags
20ed496 Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables
54f7019 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude
2a43c30 Add support for CMAKE_STATIC_LINKER_FLAGS
14bbf83 Unify the way the flags of a static library are read


---

Summary of changes:
 Modules/CMakeCommonLanguageInclude.cmake |   22 +
 Source/cmDocumentVariables.cxx   |   43 +
 Source/cmGlobalXCodeGenerator.cxx|   34 ---
 Source/cmLocalGenerator.cxx  |   40 
 Source/cmLocalGenerator.h|5 +
 Source/cmLocalVisualStudio6Generator.cxx |  101 ++
 Source/cmLocalVisualStudio7Generator.cxx |   12 +---
 Source/cmMakefileLibraryTargetGenerator.cxx  |8 +--
 Source/cmVisualStudio10TargetGenerator.cxx   |   13 +--
 Tests/CMakeLists.txt |   14 +++-
 Tests/LinkFlags/CMakeLists.txt   |9 ++
 Tests/LinkFlags/LinkerFlags/CMakeLists.txt   |   11 +++
 Tests/LinkFlags/LinkerFlagsConfig/CMakeLists.txt |   11 +++
 13 files changed, 223 insertions(+), 100 deletions(-)
 create mode 100644 Tests/LinkFlags/LinkerFlags/CMakeLists.txt
 create mode 100644 Tests/LinkFlags/LinkerFlagsConfig/CMakeLists.txt


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.11.2-651-g58c5dc3

2013-07-31 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, master has been updated
   via  58c5dc37d307c1d2a85c42e84e71cb619a6956b0 (commit)
   via  8fbf39a471593e3607e67a8915a1ec0e150d3298 (commit)
  from  4e3675ae916e824997c01989366408ff2107a96f (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=58c5dc37d307c1d2a85c42e84e71cb619a6956b0
commit 58c5dc37d307c1d2a85c42e84e71cb619a6956b0
Merge: 4e3675a 8fbf39a
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:48:57 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 08:48:57 2013 -0400

Merge topic '13582_configured_file_regeneration'

8fbf39a cmMakefile: Do not track configured files known to be temporary


---

Summary of changes:
 Source/cmMakefile.cxx |6 +-
 1 files changed, 5 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.11.2-3535-ge07275e

2013-07-31 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  e07275e4938515491b4be5157cf16bb4f9b26aac (commit)
   via  0cecc7b485774be084a6d5a72e743ed9893daa5d (commit)
   via  e3b6ab92dbb51945b81896f2d2a53f31ba63ae1a (commit)
   via  58c5dc37d307c1d2a85c42e84e71cb619a6956b0 (commit)
   via  4e3675ae916e824997c01989366408ff2107a96f (commit)
   via  f2db78c120ada2a084d69abe0296709f56c5ed10 (commit)
   via  b728ec3c3160e26dbfb7631aebd6fa22cfe6e20f (commit)
   via  cdfeda60f605fc8ef044ae28d4209a445ca09ffd (commit)
   via  6e2da4a4d3a34f62ec830720ab47d344ada73441 (commit)
   via  8e475470bec1761b9ab338f495e33b145e0ff22e (commit)
   via  9181a4e3b68ab28d8b26384f9f4983159b5dcf9b (commit)
  from  1237c224c6aa96ab5d3773b34431e60eb01f8fef (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=e07275e4938515491b4be5157cf16bb4f9b26aac
commit e07275e4938515491b4be5157cf16bb4f9b26aac
Merge: 1237c22 0cecc7b
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 08:50:56 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 31 08:50:56 2013 -0400

Merge branch 'master' into next


---

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


[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3537-g0192404

2013-07-31 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  0192404df3e4bb1ab4b2032043e91ca39a833007 (commit)
   via  452e58525bb1656df0a169c8a047c25837caa4cf (commit)
  from  e07275e4938515491b4be5157cf16bb4f9b26aac (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=0192404df3e4bb1ab4b2032043e91ca39a833007
commit 0192404df3e4bb1ab4b2032043e91ca39a833007
Merge: e07275e 452e585
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 09:11:14 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 09:11:14 2013 -0400

Merge topic 'fix-target-property-command-docs' into next

452e585 Docs: Document that target property commands require at least one 
item.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=452e58525bb1656df0a169c8a047c25837caa4cf
commit 452e58525bb1656df0a169c8a047c25837caa4cf
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 15:10:23 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Jul 31 15:10:47 2013 +0200

Docs: Document that target property commands require at least one item.

diff --git a/Source/cmTargetCompileDefinitionsCommand.h 
b/Source/cmTargetCompileDefinitionsCommand.h
index 585485d..e593d9c 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -54,7 +54,7 @@ public:
 {
 return
 target_compile_definitions(target 
-  INTERFACE|PUBLIC|PRIVATE [items1...]\n
+  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
   [INTERFACE|PUBLIC|PRIVATE [items2...] ...])\n
   Specify compile definitions to use when compiling a given target.  
   The named target must have been created by a command such as 
diff --git a/Source/cmTargetCompileOptionsCommand.h 
b/Source/cmTargetCompileOptionsCommand.h
index b9afd71..6185919 100644
--- a/Source/cmTargetCompileOptionsCommand.h
+++ b/Source/cmTargetCompileOptionsCommand.h
@@ -54,7 +54,7 @@ public:
 {
 return
 target_compile_options(target [BEFORE] 
-  INTERFACE|PUBLIC|PRIVATE [items1...]\n
+  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
   [INTERFACE|PUBLIC|PRIVATE [items2...] ...])\n
   Specify compile options to use when compiling a given target.  
   The named target must have been created by a command such as 
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h 
b/Source/cmTargetIncludeDirectoriesCommand.h
index fcc37f0..69b5e03 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -55,7 +55,7 @@ public:
 {
 return
 target_include_directories(target [SYSTEM] [BEFORE] 
-  INTERFACE|PUBLIC|PRIVATE [items1...]\n
+  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
   [INTERFACE|PUBLIC|PRIVATE [items2...] ...])\n
   Specify include directories or targets to use when compiling a given 
   target.  

---

Summary of changes:
 Source/cmTargetCompileDefinitionsCommand.h |2 +-
 Source/cmTargetCompileOptionsCommand.h |2 +-
 Source/cmTargetIncludeDirectoriesCommand.h |2 +-
 3 files changed, 3 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.11.2-3539-ge23f133

2013-07-31 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  e23f1338b6bbd75cf2a93e9fa7fef7a86656ec7b (commit)
   via  c0b868220084ad6d2ca88a4fdd9564f887374fc2 (commit)
  from  0192404df3e4bb1ab4b2032043e91ca39a833007 (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=e23f1338b6bbd75cf2a93e9fa7fef7a86656ec7b
commit e23f1338b6bbd75cf2a93e9fa7fef7a86656ec7b
Merge: 0192404 c0b8682
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 10:08:56 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 10:08:56 2013 -0400

Merge topic 'target-command-allow-no-items' into next

c0b8682 Allow target commands to be invoked with no items (#14325).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0b868220084ad6d2ca88a4fdd9564f887374fc2
commit c0b868220084ad6d2ca88a4fdd9564f887374fc2
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 16:02:07 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Jul 31 16:06:34 2013 +0200

Allow target commands to be invoked with no items (#14325).

Code such as

 target_include_directories(foo PRIVATE ${items})

should not work or break based on whether items is defined or not.

diff --git a/Source/cmTargetPropCommandBase.cxx 
b/Source/cmTargetPropCommandBase.cxx
index 287ce46..37aa604 100644
--- a/Source/cmTargetPropCommandBase.cxx
+++ b/Source/cmTargetPropCommandBase.cxx
@@ -19,7 +19,7 @@ bool cmTargetPropCommandBase
 ::HandleArguments(std::vectorstd::string const args, const char *prop,
  ArgumentFlags flags)
 {
-  if(args.size()  3)
+  if(args.size()  2)
 {
 this-SetError(called with incorrect number of arguments);
 return false;
@@ -53,7 +53,7 @@ bool cmTargetPropCommandBase
 
   if ((flags  PROCESS_SYSTEM)  args[argIndex] == SYSTEM)
 {
-if (args.size()  4)
+if (args.size()  3)
   {
   this-SetError(called with incorrect number of arguments);
   return false;
@@ -65,7 +65,7 @@ bool cmTargetPropCommandBase
   bool prepend = false;
   if ((flags  PROCESS_BEFORE)  args[argIndex] == BEFORE)
 {
-if (args.size()  4)
+if (args.size()  3)
   {
   this-SetError(called with incorrect number of arguments);
   return false;
diff --git a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt 
b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
index 6d0e646..900dbd0 100644
--- a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
@@ -20,3 +20,8 @@ target_compile_definitions(consumer
   PRIVATE 
$TARGET_PROPERTY:target_compile_definitions,INTERFACE_COMPILE_DEFINITIONS
   -DDASH_D_DEFINE
 )
+
+# Test no items
+target_compile_definitions(consumer
+  PRIVATE
+)
diff --git a/Tests/CMakeCommands/target_compile_options/CMakeLists.txt 
b/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
index 06a48fb..1d04639 100644
--- a/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
@@ -33,3 +33,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
   DO_GNU_TESTS
   )
 endif()
+
+# Test no items
+target_compile_options(consumer
+  PRIVATE
+)
diff --git a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt 
b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
index c03f0f8..21b8e15 100644
--- a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
@@ -47,3 +47,17 @@ target_include_directories(consumer
 $TARGET_PROPERTY:target_include_directories,INTERFACE_INCLUDE_DIRECTORIES
   relative_dir
 )
+
+# Test no items
+target_include_directories(consumer
+  PRIVATE
+)
+target_include_directories(consumer
+  BEFORE PRIVATE
+)
+target_include_directories(consumer
+  SYSTEM BEFORE PRIVATE
+)
+target_include_directories(consumer
+  SYSTEM PRIVATE
+)

---

Summary of changes:
 Source/cmTargetPropCommandBase.cxx |6 +++---
 .../target_compile_definitions/CMakeLists.txt  |5 +
 .../target_compile_options/CMakeLists.txt  |5 +
 .../target_include_directories/CMakeLists.txt  |   14 ++
 4 files changed, 27 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.11.2-3541-g29960ae

2013-07-31 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  29960ae9781614a8f171d5786fcb8e2b7a009004 (commit)
   via  e79ab6ab396c70e6baf5bbb813d6d2773fb2f189 (commit)
  from  e23f1338b6bbd75cf2a93e9fa7fef7a86656ec7b (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=29960ae9781614a8f171d5786fcb8e2b7a009004
commit 29960ae9781614a8f171d5786fcb8e2b7a009004
Merge: e23f133 e79ab6a
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 10:10:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 10:10:30 2013 -0400

Merge topic 'fix-target-property-command-docs' into next

e79ab6a Revert Docs: Document that target property commands require at 
least one item.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e79ab6ab396c70e6baf5bbb813d6d2773fb2f189
commit e79ab6ab396c70e6baf5bbb813d6d2773fb2f189
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 16:09:43 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Jul 31 16:09:43 2013 +0200

Revert Docs: Document that target property commands require at least one 
item.

This reverts commit 452e58525bb1656df0a169c8a047c25837caa4cf.

diff --git a/Source/cmTargetCompileDefinitionsCommand.h 
b/Source/cmTargetCompileDefinitionsCommand.h
index e593d9c..585485d 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -54,7 +54,7 @@ public:
 {
 return
 target_compile_definitions(target 
-  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
+  INTERFACE|PUBLIC|PRIVATE [items1...]\n
   [INTERFACE|PUBLIC|PRIVATE [items2...] ...])\n
   Specify compile definitions to use when compiling a given target.  
   The named target must have been created by a command such as 
diff --git a/Source/cmTargetCompileOptionsCommand.h 
b/Source/cmTargetCompileOptionsCommand.h
index 6185919..b9afd71 100644
--- a/Source/cmTargetCompileOptionsCommand.h
+++ b/Source/cmTargetCompileOptionsCommand.h
@@ -54,7 +54,7 @@ public:
 {
 return
 target_compile_options(target [BEFORE] 
-  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
+  INTERFACE|PUBLIC|PRIVATE [items1...]\n
   [INTERFACE|PUBLIC|PRIVATE [items2...] ...])\n
   Specify compile options to use when compiling a given target.  
   The named target must have been created by a command such as 
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h 
b/Source/cmTargetIncludeDirectoriesCommand.h
index 69b5e03..fcc37f0 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -55,7 +55,7 @@ public:
 {
 return
 target_include_directories(target [SYSTEM] [BEFORE] 
-  INTERFACE|PUBLIC|PRIVATE item [items1...]\n
+  INTERFACE|PUBLIC|PRIVATE [items1...]\n
   [INTERFACE|PUBLIC|PRIVATE [items2...] ...])\n
   Specify include directories or targets to use when compiling a given 
   target.  

---

Summary of changes:
 Source/cmTargetCompileDefinitionsCommand.h |2 +-
 Source/cmTargetCompileOptionsCommand.h |2 +-
 Source/cmTargetIncludeDirectoriesCommand.h |2 +-
 3 files changed, 3 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.11.2-3543-g8fcf9ac

2013-07-31 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  8fcf9ac319a174bb427de84f1d9188e07bb773f4 (commit)
   via  b64e8f22a4f08972e2d4b2bd5bd338247ec0946c (commit)
  from  29960ae9781614a8f171d5786fcb8e2b7a009004 (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=8fcf9ac319a174bb427de84f1d9188e07bb773f4
commit 8fcf9ac319a174bb427de84f1d9188e07bb773f4
Merge: 29960ae b64e8f2
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 10:22:10 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 10:22:10 2013 -0400

Merge topic 'vs-subsystem-order' into next

b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b64e8f22a4f08972e2d4b2bd5bd338247ec0946c
commit b64e8f22a4f08972e2d4b2bd5bd338247ec0946c
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 31 10:14:33 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 31 10:17:17 2013 -0400

VS10: Honor user-specified /SUBSYSTEM: flag (#14326)

Use the WIN32_EXECUTABLE target property only to set the SubSystem build
attribute default.  When user-specified flags are later parsed they may
then override it.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index da5696a..1130704 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1520,11 +1520,11 @@ 
cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const config)
 }
   if ( this-Target-GetPropertyAsBool(WIN32_EXECUTABLE) )
 {
-flags +=  /SUBSYSTEM:WINDOWS;
+linkOptions.AddFlag(SubSystem, Windows);
 }
   else
 {
-flags +=  /SUBSYSTEM:CONSOLE;
+linkOptions.AddFlag(SubSystem, Console);
 }
   std::string standardLibsVar = CMAKE_;
   standardLibsVar += linkLanguage;

---

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |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.11.2-3545-gc57b8d5

2013-07-31 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  c57b8d5618a6dd664b932b92c9c87ccc3dbcfed4 (commit)
   via  742994125417b30443e8e58a72a2839c31d97c23 (commit)
  from  8fcf9ac319a174bb427de84f1d9188e07bb773f4 (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=c57b8d5618a6dd664b932b92c9c87ccc3dbcfed4
commit c57b8d5618a6dd664b932b92c9c87ccc3dbcfed4
Merge: 8fcf9ac 7429941
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 11:15:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 11:15:08 2013 -0400

Merge topic 'minor-cleanups' into next

7429941 Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIES


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=742994125417b30443e8e58a72a2839c31d97c23
commit 742994125417b30443e8e58a72a2839c31d97c23
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 17:13:46 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Jul 31 17:13:46 2013 +0200

Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIES

Introduced in commit f10e6480 (Docs: Document existing target
property debugging options., 2013-07-26)

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 91e278e..2c2d377 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -966,8 +966,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
  only be used when evaluating the INCLUDE_DIRECTORIES, 
  COMPILE_DEFINITIONS and COMPILE_OPTIONS target properties.  
  In that case, it outputs a backtrace for each entry in the target 
- propertythe build.  Default is unset.,
- false,Variables That Change Behavior);
+ property.  Default is unset., false, Variables That Change Behavior);
 
   // Variables defined by CMake that describe the system
 

---

Summary of changes:
 Source/cmDocumentVariables.cxx |3 +--
 1 files changed, 1 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.11.2-3548-g14668d1

2013-07-31 Thread Daniele E . Domenichelli
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  14668d1346619005d94b3c1777acb85abb0a4a57 (commit)
   via  7ca5958820b7741b251081af66e1cb67af243fd5 (commit)
   via  76c72b9f14258933e4cf810da275bd2b931c5ac9 (commit)
  from  c57b8d5618a6dd664b932b92c9c87ccc3dbcfed4 (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=14668d1346619005d94b3c1777acb85abb0a4a57
commit 14668d1346619005d94b3c1777acb85abb0a4a57
Merge: c57b8d5 7ca5958
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Jul 31 11:42:35 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 11:42:35 2013 -0400

Merge topic 'FindGTK2-gmodule' into next

7ca5958 FindGTK2: Detect gmodule library
76c72b9 FindGTK2: gthread-2.0 folder does not exist


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ca5958820b7741b251081af66e1cb67af243fd5
commit 7ca5958820b7741b251081af66e1cb67af243fd5
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Jul 31 17:40:07 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jul 31 17:40:07 2013 +0200

FindGTK2: Detect gmodule library

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index efb1d9f..f7d3bf8 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -77,6 +77,7 @@
 # appropriate. A new set of _RELEASE variables was also added.
 #   * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
 # marked as advanced by SelectLibraryConfigurations
+#   * Detect gmodule library
 # Version 1.4 (10/4/2012) (CMake 2.8.10)
 #   * 12596: Missing paths for FindGTK2 on NetBSD
 #   * 12049: Fixed detection of GTK include files in the lib folder on
@@ -482,6 +483,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 
 _GTK2_FIND_LIBRARY(GTK2_GTHREAD gthread false true)
 
+_GTK2_FIND_LIBRARY(GTK2_GMODULE gmodule false true)
+
 _GTK2_FIND_LIBRARY(GTK2_GIO gio false true)
 
 _GTK2_FIND_INCLUDE_DIR(GTK2_ATK atk/atk.h)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76c72b9f14258933e4cf810da275bd2b931c5ac9
commit 76c72b9f14258933e4cf810da275bd2b931c5ac9
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Jul 31 17:37:46 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jul 31 17:39:38 2013 +0200

FindGTK2: gthread-2.0 folder does not exist

Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 4f522e5..efb1d9f 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -178,7 +178,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
 cairo
 cairomm-1.0
 gdk-pixbuf-2.0
-gthread-2.0
 gdkmm-2.4
 giomm-2.4
 gtk-2.0

---

Summary of changes:
 Modules/FindGTK2.cmake |4 +++-
 1 files changed, 3 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.11.2-3551-g1bf070e

2013-07-31 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  1bf070ea14b1dfab4d70b1debbd9e5d6b9c2fcb9 (commit)
   via  80e652f5cc279715ff57e1c64c6e5c460b201db4 (commit)
   via  43558156d451b605bb9a3d14d53a3896ea98d73a (commit)
  from  14668d1346619005d94b3c1777acb85abb0a4a57 (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=1bf070ea14b1dfab4d70b1debbd9e5d6b9c2fcb9
commit 1bf070ea14b1dfab4d70b1debbd9e5d6b9c2fcb9
Merge: 14668d1 80e652f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 18:41:06 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 18:41:06 2013 -0400

Merge topic 'INCLUDES-DESTINATION-no-config' into next

80e652f Export: Process generator expressions from INCLUDES DESTINATION.
4355815 cmTarget: Add NAME property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80e652f5cc279715ff57e1c64c6e5c460b201db4
commit 80e652f5cc279715ff57e1c64c6e5c460b201db4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jul 31 16:40:35 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Aug 1 00:37:25 2013 +0200

Export: Process generator expressions from INCLUDES DESTINATION.

Configuration sensitive expressions are not permitted.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 5b351bc..ef336ea 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -287,11 +287,33 @@ void 
cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 
   const char *propName = INTERFACE_INCLUDE_DIRECTORIES;
   const char *input = target-GetProperty(propName);
-  if (!input  tei-InterfaceIncludeDirectories.empty())
+
+  cmListFileBacktrace lfbt;
+  cmGeneratorExpression ge(lfbt);
+
+  std::string dirs = tei-InterfaceIncludeDirectories;
+  this-ReplaceInstallPrefix(dirs);
+  cmsys::auto_ptrcmCompiledGeneratorExpression cge = ge.Parse(dirs);
+  std::string exportDirs = cge-Evaluate(target-GetMakefile(), 0,
+ false, target);
+
+  if (cge-GetHadContextSensitiveCondition())
+{
+cmMakefile* mf = target-GetMakefile();
+cmOStringStream e;
+e  Target \  target-GetName()  \ is installed with 
+INCLUDES DESTINATION set to a context sensitive path.  Paths which 
+depend on the configuration, policy values or the link interface are 
+not supported.  Consider using target_include_directories instead.;
+mf-IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+}
+
+  if (!input  exportDirs.empty())
 {
 return;
 }
-  if ((input  !*input)  tei-InterfaceIncludeDirectories.empty())
+  if ((input  !*input)  exportDirs.empty())
 {
 // Set to empty
 properties[propName] = ;
@@ -300,7 +322,7 @@ void 
cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 
   std::string includes = (input?input:);
   const char* sep = input ? ; : ;
-  includes += sep + tei-InterfaceIncludeDirectories;
+  includes += sep + exportDirs;
   std::string prepro = cmGeneratorExpression::Preprocess(includes,
  preprocessRule,
  true);
diff --git a/Tests/ExportImport/Export/CMakeLists.txt 
b/Tests/ExportImport/Export/CMakeLists.txt
index 1910f8c..b5b2027 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -99,7 +99,6 @@ macro(add_include_lib _libName)
   set_property(TARGET ${_libName} APPEND PROPERTY
   INTERFACE_INCLUDE_DIRECTORIES
 $BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${_libName}
-$INSTALL_INTERFACE:$INSTALL_PREFIX/include/${_libName}
   )
   if (NOT ${ARGV1} STREQUAL NO_HEADER)
   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_libName}/${_libName}.h // 
no content\n)
@@ -188,8 +187,7 @@ install(FILES
 DESTINATION include/testSharedLibRequired
 )
 set_property(TARGET testSharedLibRequired APPEND PROPERTY
-  INTERFACE_INCLUDE_DIRECTORIES 
$INSTALL_INTERFACE:$INSTALL_PREFIX/include/testSharedLibRequired
-
$BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}
+  INTERFACE_INCLUDE_DIRECTORIES 
$BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}
 )
 set_property(TARGET testSharedLibRequired APPEND PROPERTY
   INTERFACE_COMPILE_DEFINITIONS USING_TESTSHAREDLIBREQUIRED
@@ -273,18 +271,24 @@ set_property(TARGET cmp0022OLD APPEND PROPERTY 
LINK_INTERFACE_LIBRARIES testLib3
 add_library(noIncludesInterface empty.cpp)
 
 install(TARGETS 

[Cmake-commits] CMake branch, master, updated. v2.8.11.2-668-gf0f7ee0

2013-07-31 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  f0f7ee0adf0887cdb0460ef6afda7615c36fcdbf (commit)
  from  0cecc7b485774be084a6d5a72e743ed9893daa5d (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=f0f7ee0adf0887cdb0460ef6afda7615c36fcdbf
commit f0f7ee0adf0887cdb0460ef6afda7615c36fcdbf
Author: Kitware Robot kwro...@kitware.com
AuthorDate: Thu Aug 1 00:01:09 2013 -0400
Commit: Kitware Robot kwro...@kitware.com
CommitDate: Thu Aug 1 00:01:09 2013 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f63178e..0d165d2 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 11)
-set(CMake_VERSION_TWEAK 20130731)
+set(CMake_VERSION_TWEAK 20130801)
 #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