Re: [cmake-developers] FindFreetype Patches

2014-05-27 Thread Brad King 
On 05/25/2014 01:05 AM, Taylor Holberton wrote:
 Here's some patches for the FindFreetype module.
 The first few patches change formatting. While the
 last one extends the functionality.

Thanks.  I've applied the style changes:

 FindFreetype: Add newlines to reduce code width
 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ad6dace

 FindFreetype: Move PATH_SUFFIXES argument for more consistency
 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=836a28d5

 FindFreetype: Use lower-case name in call to FPHSA
 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=444f8801

 FindFreetype: Indent with 2 spaces instead of 4
 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f7baab

In the last change, the explicit CMAKE_SYSTEM_PREFIX_PATH
reference should not be necessary.  The commands already
use that variable internally to generate paths.  Just add
PATH_SUFFIXES to refer to the path under the install prefix
at which the freetype2 headers exist.

Thanks,
-Brad

-- 

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

Re: [CMake] need help fixing warning message... 3.0

2014-05-27 Thread Hendrik Sattler 
Can this be solved with CMAKE_STAGING_PREFIX or CMAKE_SYSROOT in CMake 3.0?
From the documentation, it looks like to have exactly this purpose.

On 26. Mai 2014 23:06:51 MESZ, J Decker d3c...@gmail.com wrote:
if it exists as a target; I need to know the path to the built library
for
subsequent projects to link against.  I have to manually add the option
-Lpath to build library) -lbaselibname to avoid having the full path
linked into the resulting .so.

if I just use 'add_link_library' then the resulting library will not
load
except on the system that built it, because the library name references
contain paths to the libs not just the libname.




On Mon, May 26, 2014 at 1:49 PM, Hendrik Sattler
p...@hendrik-sattler.dewrote:

 Maybe you can explain _why_ you need to do it this way? Can it be
solved
 more inline with the better cross-compile support in cmake-3.0?

 On 26. Mai 2014 19:29:20 MESZ, J Decker d3c...@gmail.com wrote:

 So... no alternatives to location in this instance?


 On Sat, May 24, 2014 at 7:28 PM, J Decker d3c...@gmail.com wrote:

 CMake Warning (dev) at

C:/general/build/android/karaway/debug_out/core/DefaultInstall.cmake:203
 (get_property):
   Policy CMP0026 is not set: Disallow use of the LOCATION target
 property.
   Run cmake --help-policy CMP0026 for policy details.  Use the
 cmake_policy
   command to set the policy and suppress this warning.

   The LOCATION property should not be read from target
keypad.isp.
  Use the
   target name directly with add_custom_command, or use the
generator
   expression $TARGET_FILE, as appropriate.

 Call Stack (most recent call first):
   security.null/CMakeLists.txt:23 (my_target_link_libraries)
 This warning is for project developers.  Use -Wno-dev to suppress
it.


 -

 macro(my_target_link_libraries target )
 if(CMAKE_COMPILER_IS_GNUCC AND __ANDROID__ )
foreach( target_lib ${ARGN} )
   if( TARGET ${target_lib} )
  get_property( lib_path TARGET ${target_lib} PROPERTY
 LOCATION)
  get_property( existing_outname TARGET ${target_lib}
 PROPERTY OUTPUT_NAME )
  if( NOT existing_outname )
 set( existing_outname ${target_lib} )
  endif( NOT existing_outname )
  if( ${lib_path} MATCHES (.*)/([^/]*)$ )
 get_target_property(existing_link_flags ${target}
 LINK_FLAGS)
 if(existing_link_flags)
  set(new_link_flags ${existing_link_flags} -L
 ${CMAKE_MATCH_1} -l ${existing_outname})
 else()
 set(new_link_flags -L ${CMAKE_MATCH_1} -l
 ${existing_outname})
 endif()
 set_target_properties( ${target} PROPERTIES
LINK_FLAGS
 ${new_link_flags})
  add_dependencies( ${target} ${target_lib} )
  endif( ${lib_path} MATCHES (.*)/([^/]*)$ )
   else()
  target_link_libraries( ${target} ${target_lib} )
   endif( TARGET ${target_lib} )
endforeach( target_lib ${ARGN} )
 else()
 target_link_libraries( ${target} ${ARGN} )
 endif()
 endmacro()

 --
 In the script I'm getting LOCATION to know if the referenced
library is
 a full pathname or a short  name so I can strip the path
appropriately... I
 don't think the target_file solution works here, what other
alternative is
 there?


 --

 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


 --
 Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail
 gesendet.

 --

 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,

Re: [CMake] need help fixing warning message... 3.0

2014-05-27 Thread J Decker 
These result from the libraries resulting from the built sources, not from
the sysroot libs or things discovered with find packages.


On Tue, May 27, 2014 at 1:37 AM, Hendrik Sattler p...@hendrik-sattler.dewrote:

 Can this be solved with CMAKE_STAGING_PREFIX or CMAKE_SYSROOT in CMake 3.0?
 From the documentation, it looks like to have exactly this purpose.


 On 26. Mai 2014 23:06:51 MESZ, J Decker d3c...@gmail.com wrote:

 if it exists as a target; I need to know the path to the built library
 for subsequent projects to link against.  I have to manually add the option
 -Lpath to build library) -lbaselibname to avoid having the full path
 linked into the resulting .so.

 if I just use 'add_link_library' then the resulting library will not load
 except on the system that built it, because the library name references
 contain paths to the libs not just the libname.




 On Mon, May 26, 2014 at 1:49 PM, Hendrik Sattler p...@hendrik-sattler.de
  wrote:

 Maybe you can explain _why_ you need to do it this way? Can it be solved
 more inline with the better cross-compile support in cmake-3.0?

 On 26. Mai 2014 19:29:20 MESZ, J Decker d3c...@gmail.com wrote:

  So... no alternatives to location in this instance?


 On Sat, May 24, 2014 at 7:28 PM, J Decker d3c...@gmail.com wrote:

 CMake Warning (dev) at
 C:/general/build/android/karaway/debug_out/core/DefaultInstall.cmake:203
 (get_property):
   Policy CMP0026 is not set: Disallow use of the LOCATION target
 property.
   Run cmake --help-policy CMP0026 for policy details.  Use the
 cmake_policy
   command to set the policy and suppress this warning.

   The LOCATION property should not be read from target keypad.isp.
  Use the
   target name directly with add_custom_command, or use the generator
   expression $TARGET_FILE, as appropriate.

 Call Stack (most recent call first):
   security.null/CMakeLists.txt:23 (my_target_link_libraries)
 This warning is for project developers.  Use -Wno-dev to suppress it.


 -

 macro(my_target_link_libraries target )
 if(CMAKE_COMPILER_IS_GNUCC AND __ANDROID__ )
foreach( target_lib ${ARGN} )
   if( TARGET ${target_lib} )
  get_property( lib_path TARGET ${target_lib} PROPERTY
 LOCATION)
  get_property( existing_outname TARGET ${target_lib}
 PROPERTY OUTPUT_NAME )
  if( NOT existing_outname )
 set( existing_outname ${target_lib} )
  endif( NOT existing_outname )
  if( ${lib_path} MATCHES (.*)/([^/]*)$ )
 get_target_property(existing_link_flags ${target}
 LINK_FLAGS)
 if(existing_link_flags)
  set(new_link_flags ${existing_link_flags} -L
 ${CMAKE_MATCH_1} -l ${existing_outname})
 else()
 set(new_link_flags -L ${CMAKE_MATCH_1} -l
 ${existing_outname})
 endif()
 set_target_properties( ${target} PROPERTIES LINK_FLAGS
 ${new_link_flags})
  add_dependencies( ${target} ${target_lib} )
  endif( ${lib_path} MATCHES (.*)/([^/]*)$ )
   else()
  target_link_libraries( ${target} ${target_lib} )
   endif( TARGET ${target_lib} )
endforeach( target_lib ${ARGN} )
 else()
 target_link_libraries( ${target} ${ARGN} )
 endif()
 endmacro()

 --
 In the script I'm getting LOCATION to know if the referenced library
 is a full pathname or a short  name so I can strip the path
 appropriately... I don't think the target_file solution works here, what
 other alternative is there?


 --

 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


 --
 Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail
 gesendet.

 --

 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

Re: [CMake] need help fixing warning message... 3.0

2014-05-27 Thread Nils Gladitz 

On 05/27/2014 11:10 AM, J Decker wrote:

These result from the libraries resulting from the built sources, not
from the sysroot libs or things discovered with find packages.



I probably don't fully understand the issue but couldn't this easily 
enough be patched in CMake itself (e.g. attached untested patch with 
CMAKE_PLATFORM_NO_SONAME_SUPPORT set to ON)?


Is there an open issue for this?

Nils

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index ea8536f..59b0c8e 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -345,6 +345,10 @@ cmComputeLinkInformation
   this-NoSONameUsesPath =
 this-Makefile-IsOn(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME);
 
+  // Check if the platform supports SONAMEs at all
+  this-NoSONameSupport =
+this-Makefile-IsOn(CMAKE_PLATFORM_NO_SONAME_SUPPORT);
+
   // Get link type information.
   this-ComputeLinkTypeInfo();
 
@@ -1084,8 +1088,8 @@ void cmComputeLinkInformation::AddTargetItem(std::string const item,
 }
 
   // Handle case of an imported shared library with no soname.
-  if(this-NoSONameUsesPath 
- target-IsImportedSharedLibWithoutSOName(this-Config))
+  if(this-NoSONameSupport || (this-NoSONameUsesPath 
+ target-IsImportedSharedLibWithoutSOName(this-Config)))
 {
 this-AddSharedLibNoSOName(item);
 return;
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index e345fe2..f690d87 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -106,6 +106,7 @@ private:
   std::string RuntimeAlways;
   bool RuntimeUseChrpath;
   bool NoSONameUsesPath;
+  bool NoSONameSupport;
   bool LinkWithRuntimePath;
   std::string RPathLinkFlag;
   SharedDepMode SharedDependencyMode;
-- 

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] need help fixing warning message... 3.0

2014-05-27 Thread J Decker 
Without modification
target_link_libraries( ${target} ${target_lib} )

generates a link command like this

gcc.exe --sysroot=c:/.../platforms/android-14/arch-arm -fPIC -g -D_DEBUG
  -lstdc++ -lgnustl_static -shared  -o
libEditOptions.code.soCMakeFiles/EditOptions.code.dir/editopt.c.obj
  -Lc:\..\platforms\android-14\arch-arm\usr\lib
 -Lc:\...\sources\cxx-stl\gnu-libstdc++\4.6\libs\armeabi
 ..\..\..\..\libbag.so ..\..\..\..\libbag.psi.so ..\..\..\..\
libbag.externals.so ..\..\..\..\libbag.so ..\..\..\..\libbag.externals.so
-lm -landroid -llog

which results in a library that has the error
   : error: Cannot load library: link_image[1891]:   201 could not load
needed library '..\..\..\..\libbag.so' for 'libEditOptions.code.so'
(load_library[1093]: Library '..\..\..\..\libbag.so' not found)

gcc.exe --sysroot=c:/.../platforms/android-14/arch-arm -fPIC -g -D_DEBUG
  -L C:/general/build/android.2/debug_solution/core -l bag
   -L C:/general/build/android.2/debug_solution/core -l bag.psi
  -L C:/general/build/android.2/debug_solution/core -l bag.externals
  -lstdc++ -lgnustl_static -shared  -o
libbag.video.proxy.client.code.soCMakeFiles/bag.video.proxy.client.code.dir/client.c.obj
  -Lc:\...\platforms\android-14\arch-arm\usr\lib
  -Lc:\...\sources\cxx-stl\gnu-libstdc++\4.6\libs\armeabi


So my script tests if LOCATION of ${target_lib} is something like

 get_property( lib_path TARGET ${target_lib} PROPERTY LOCATION)
 if( ${lib_path} MATCHES (.*)/([^/]*)$ )

which
lib_path=C:/general/build/android.2/debug_solution/core/
libbag.externals.so

does match

which adds -L (path part) and -l basename,   instead of the path name
that doesn't work

and  adds a dependancy of the targetlib on the target.


(output is from cmake 2.8.10.2; not 3)



On Tue, May 27, 2014 at 3:01 AM, Nils Gladitz nilsglad...@gmail.com wrote:

 On 05/27/2014 11:10 AM, J Decker wrote:

 These result from the libraries resulting from the built sources, not
 from the sysroot libs or things discovered with find packages.


 I probably don't fully understand the issue but couldn't this easily
 enough be patched in CMake itself (e.g. attached untested patch with
 CMAKE_PLATFORM_NO_SONAME_SUPPORT set to ON)?

 Is there an open issue for this?

 Nils


-- 

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] need help fixing warning message... 3.0

2014-05-27 Thread Nils Gladitz 

On 05/27/2014 12:25 PM, J Decker wrote:

Without modification
target_link_libraries( ${target} ${target_lib} )

generates a link command like this


Yeah I think I got that part ... which is why I proposed modification.
Or do you mean that is the result after applying the patch?

Nils

--

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] need help fixing warning message... 3.0

2014-05-27 Thread J Decker 
On Tue, May 27, 2014 at 3:30 AM, Nils Gladitz nilsglad...@gmail.com wrote:

 On 05/27/2014 12:25 PM, J Decker wrote:

 Without modification
 target_link_libraries( ${target} ${target_lib} )

 generates a link command like this


 Yeah I think I got that part ... which is why I proposed modification.
 Or do you mean that is the result after applying the patch?

 sorry I can't apply a patch yet... I'll maybe work on that tomorrow



 Nils


-- 

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] The target property LOCATION

2014-05-27 Thread Micha Renner 
Hi,

FIND_PACKAGE(TLib) 

GET_TARGET_PROPERTY(Result MiG::TLib LOCATION)

results in
/usr/local/lib/libTLib.so.3.4.1

I would expect /usr/local/lib/libTLib.so

Is this a bug or a feature?

Micha


-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Robert Bielik 
*Bump*

Does anyone use CMake on Mac with Xcode 5 (LLVM) ? I cannot get rid of the -s 
option to the linker (Release), so presumably no one else can either, hence
no one should be able to use CMake with LLVM ? ;)

To build today for Release I use Unix Makefiles, then remove -s from linker 
settings files (Link.txt) with sed, but it seems a suboptimal solution.

Regards
/Robert

Robert Bielik skrev 2014-05-21 10:22:
 c++ --version:
 Apple LLVM version 5.1
 
 Problem description:
 
 Linking always fails in Release build:
 
 Warning: Option -s is obsolete and being ignored
 
 with the following error:
 
 Internal error: atom not found in symbolIndex(symbol) for architecture ...
 
 If I remove the -s option from linking (tried it with Makefile), the linking 
 succeeds ! (even though ld explicitly says -s option
 is being ignored, it obviously is NOT ignored)
 
 BUT, on Mac OS X, CMake ALWAYS adds the -s option for linking, despite me 
 removing it via CMake-GUI/ccmake or by editing
 the CMakeCache.txt file. 
 
 How should I make sure that CMake does NOT add the -s option for Release ??
 
 Regards
 /Robert
 
-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Nils Gladitz 

On 05/27/2014 03:08 PM, Robert Bielik wrote:

*Bump*

Does anyone use CMake on Mac with Xcode 5 (LLVM) ? I cannot get rid of the -s 
option to the linker (Release), so presumably no one else can either, hence
no one should be able to use CMake with LLVM ? ;)

To build today for Release I use Unix Makefiles, then remove -s from linker 
settings files (Link.txt) with sed, but it seems a suboptimal solution.

Regards
/Robert


I am not a Mac user but there seems to be a CMake Dashboard setup for
 Release
 OSX 10.9
 XCode 5.0.2
 AppleClang 5.0.0.5000279
Does that get close?

It seems to be working alright:
  http://open.cdash.org/viewConfigure.php?buildid=3344689

Perhaps you could give 3.0-rc6 a try to see if this is something that 
has been fixed at some point?


Nils
--

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Bogdan Cristea 

On 27 May 2014, at 15:45, Nils Gladitz nilsglad...@gmail.com wrote:

 On 05/27/2014 03:08 PM, Robert Bielik wrote:
 *Bump*
 
 Does anyone use CMake on Mac with Xcode 5 (LLVM) ? I cannot get rid of the 
 -s option to the linker (Release), so presumably no one else can either, 
 hence
 no one should be able to use CMake with LLVM ? ;)
 
 To build today for Release I use Unix Makefiles, then remove -s from 
 linker settings files (Link.txt) with sed, but it seems a suboptimal 
 solution.
 
 Regards
 /Robert
 
 I am not a Mac user but there seems to be a CMake Dashboard setup for
 Release
 OSX 10.9
 XCode 5.0.2
 AppleClang 5.0.0.5000279
 Does that get close?
 
 It seems to be working alright:
  http://open.cdash.org/viewConfigure.php?buildid=3344689
 
 Perhaps you could give 3.0-rc6 a try to see if this is something that has 
 been fixed at some point?
 
 
 
 


I can confirm that I cannot use Xcode generator for a C++ project. Only 
Makefile generator works on OSX

-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Robert Bielik 
Hi Bogdan,

Bogdan Cristea skrev 2014-05-27 15:49: 
 I can confirm that I cannot use Xcode generator for a C++ project. Only 
 Makefile generator works on OSX

But still, you get -s option in Link.txt files, right ? What version of 
Xcode/LLVM do you use ?

Regards
/Robert
-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Robert Bielik 
Thanks Nils, will try out the 3.0 RC.

Regards
/Robert

Nils Gladitz skrev 2014-05-27 15:45:
 On 05/27/2014 03:08 PM, Robert Bielik wrote:
 *Bump*

 Does anyone use CMake on Mac with Xcode 5 (LLVM) ? I cannot get rid of the 
 -s option to the linker (Release), so presumably no one else can either, 
 hence
 no one should be able to use CMake with LLVM ? ;)

 To build today for Release I use Unix Makefiles, then remove -s from 
 linker settings files (Link.txt) with sed, but it seems a suboptimal 
 solution.

 Regards
 /Robert
 
 I am not a Mac user but there seems to be a CMake Dashboard setup for
  Release
  OSX 10.9
  XCode 5.0.2
  AppleClang 5.0.0.5000279
 Does that get close?
 
 It seems to be working alright:
   http://open.cdash.org/viewConfigure.php?buildid=3344689
 
 Perhaps you could give 3.0-rc6 a try to see if this is something that has 
 been fixed at some point?
 
 Nils
-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Bogdan Cristea 

On 27 May 2014, at 16:36, Robert Bielik robert.bie...@dirac.se wrote:

 Hi Bogdan,
 
 Bogdan Cristea skrev 2014-05-27 15:49: 
 I can confirm that I cannot use Xcode generator for a C++ project. Only 
 Makefile generator works on OSX
 
 But still, you get -s option in Link.txt files, right ? What version of 
 Xcode/LLVM do you use ?
 

I don’t see this file when using Xcode generator. An open on the generated 
.xcodeproj generates the error “project file cannot be parsed”. I am using OSX 
Mavericks with latest Xcode, llvm
-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Robert Bielik 
Hi,

Bogdan Cristea skrev 2014-05-27 16:44:

 But still, you get -s option in Link.txt files, right ? What version of 
 Xcode/LLVM do you use ?

 
 I don’t see this file when using Xcode generator. An open on the generated 
 .xcodeproj generates the error “project file cannot be parsed”. I am using 
 OSX Mavericks with latest Xcode, llvm

Not with Xcode generator, no, but it should be present when using the Makefile 
generator.

Which version of CMake do you use ?

Regards
/R
 
-- 

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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Bogdan Cristea 

On 27 May 2014, at 16:53, Robert Bielik robert.bie...@dirac.se wrote:

 Not with Xcode generator, no, but it should be present when using the 
 Makefile generator.
 
 Which version of CMake do you use ?

cmake version 2.8.12.2



-- 

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] ExternalPackage_Add with Non-CMake project that runs differently then equivalent shell script

2014-05-27 Thread Williams, Norman K 
I took what you did it and cleaned it up a bit, but I ran into the same
issue.  Strangely, in trying to debug it I ran
Œmake VERBOSE=1¹ and THAT command succeeded where Œmake¹ by itself had
that problem with finding the target ¹s¹

I then tried setting CMAKE_VERBOSE_MAKEFILE to ON and same thing, the
build succeeded. So I don¹t know where that target ¹s¹ complaint came from.

So maybe this is something to log as a bug.

By the way, Metis actually comes with a Cmake build setup (I.e.
CMakeLists.txt) but it¹s broken.

This is the CMakeLists.txt I wrote to test with:

cmake_minimum_required(VERSION 2.8)
project(MetisBuild)
include(ExternalProject)
ExternalProject_Add(Metis
  URL http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
  URL_MD5 0
  SOURCE_DIR Metis
  BUILD_IN_SOURCE 1
  BUILD_COMMAND ${CMAKE_BUILD_TOOL}
  UPDATE_COMMAND 
  CONFIGURE_COMMAND ${CMAKE_BUILD_TOOL} config shared=1
prefix=${CMAKE_INSTALL_PREFIX}/contrib/Metis
  INSTALL_COMMAND ${CMAKE_BUILD_TOOL} install
  INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/contrib/Metis
)






Notice: This UI Health Care e-mail (including attachments) is covered by the 
Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and 
may be legally privileged.  If you are not the intended recipient, you are 
hereby notified that any retention, dissemination, distribution, or copying of 
this communication is strictly prohibited.  Please reply to the sender that you 
have received the message in error, then delete it.  Thank you.

-- 

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] Outputting valgrind-style DynamicAnalysis.xml from CTest

2014-05-27 Thread Hideaki Kimura 
Hi,
I'm trying to integrate a CTest's valgrind-test with Jenkins.
Jenkins has a nice plugin to show the results of valgrind xml, but it
assumes the given xml outputs are in valgrind format. The jenkins plugin
seems to have no plan to support that in near future, either.

Original discussion:
https://issues.jenkins-ci.org/browse/JENKINS-23178?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel

So, the question/request is:
 - Is it possible to output DynamicAnalysis.xml in valgrind xml format?
 - If it's not possible currently, could you add the feature (eg
--valgrind-xml-format option)?
 - Is there any workaround anyone tried (eg conversion program from
DynamicAnalysis.xml to valgrind's xml format)?

Thanks,
-- Hideaki
-- 

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] Outputting valgrind-style DynamicAnalysis.xml from CTest

2014-05-27 Thread Bogdan Cristea 
ctest calls valgrind with massif tool if I remember correctly. There is a 
jenkins plugin for handling massif output


On 27 May 2014, at 20:49, Hideaki Kimura hideaki.kim...@gmail.com wrote:

 Hi,
 I'm trying to integrate a CTest's valgrind-test with Jenkins.
 Jenkins has a nice plugin to show the results of valgrind xml, but it assumes 
 the given xml outputs are in valgrind format. The jenkins plugin seems to 
 have no plan to support that in near future, either.
 
 Original discussion: 
 https://issues.jenkins-ci.org/browse/JENKINS-23178?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 
 So, the question/request is:
  - Is it possible to output DynamicAnalysis.xml in valgrind xml format?
  - If it's not possible currently, could you add the feature (eg 
 --valgrind-xml-format option)?
  - Is there any workaround anyone tried (eg conversion program from 
 DynamicAnalysis.xml to valgrind's xml format)?
 
 Thanks,
 -- Hideaki
 -- 
 
 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] Problem with CMake 2.8.12.2 on Mac OS X

2014-05-27 Thread Robert Bielik 
AND... can you paste the content of Link.txt ? 

/R

Bogdan Cristea skrev 2014-05-27 16:56:
 
 On 27 May 2014, at 16:53, Robert Bielik robert.bie...@dirac.se wrote:
 
 Not with Xcode generator, no, but it should be present when using the 
 Makefile generator.

 Which version of CMake do you use ?
 
 cmake version 2.8.12.2
 
 
 
 
-- 

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] ExternalPackage_Add with Non-CMake project that runs differently then equivalent shell script

2014-05-27 Thread Chad Balen 
Hi Norman,

I used your CMakeLists script and I tried adding VERBOSE=1 likeso:

BUILD_COMMAND ${CMAKE_BUILD_TOOL} VERBOSE=1

But I still get the same error (I also tried adding VERBOSE to the end of
the CONFIGURE_COMMAND and INSTALL_COMMAND but same thing). Maybe it's worth
noting in terminal the VERBOSE command resulted in this also being printed
throughout the make process:

Dependee
/Build/Metis/src/Metis/build/Linux-x86_64/libmetis/CMakeFiles/metis.dir/DependInfo.cmake
is newer than depender
/Build/Metis/src/Metis/build/Linux-x86_64/libmetis/CMakeFiles/metis.dir/depend.internal.
Dependee
/Build/Metis/src/Metis/build/Linux-x86_64/libmetis/CMakeFiles/CMakeDirectoryInformation.cmake
is newer than depender
/Build/Metis/src/Metis/build/Linux-x86_64/libmetis/CMakeFiles/metis.dir/depend.internal.

Anyways I then went set CMAKE_VERBOSE_MAKEFILE to ON likeso:

SET(CMAKE_VERBOSE_MAKEFILE ON)
ExternalProject_Add(Metis ...

and then it told me: make[4]: *** No rule to make target `w'

where it used to say target 's'. Did I not use VERBOSE correctly? If I did
use it correctly then your solution may be machine dependent then.
Interestingly, if I jump from config to make install likeso:

CONFIGURE_COMMAND ${CMAKE_BUILD_TOOL} config shared=1
prefix=${CMAKE_INSTALL_PREFIX}/Metis

BUILD_COMMAND ${CMAKE_BUILD_TOOL} install

it will then give the same error but AFTER it installs Metis. Is there by
any chance a way to make CMake ignore this error and continue running? That
way I wouldn't have to wait for a fix to this bug.


Thanks for the help,
Chad


--
Chad Balen, E.I.T.
Energy Systems Design Laboratory,
3-23 Mechanical Engineering Building,
University of Alberta,
Edmonton, AB


On Tue, May 27, 2014 at 12:16 PM, Williams, Norman K 
norman-k-willi...@uiowa.edu wrote:

 I took what you did it and cleaned it up a bit, but I ran into the same
 issue.  Strangely, in trying to debug it I ran
 Œmake VERBOSE=1¹ and THAT command succeeded where Œmake¹ by itself had
 that problem with finding the target ¹s¹

 I then tried setting CMAKE_VERBOSE_MAKEFILE to ON and same thing, the
 build succeeded. So I don¹t know where that target ¹s¹ complaint came from.

 So maybe this is something to log as a bug.

 By the way, Metis actually comes with a Cmake build setup (I.e.
 CMakeLists.txt) but it¹s broken.

 This is the CMakeLists.txt I wrote to test with:

 cmake_minimum_required(VERSION 2.8)
 project(MetisBuild)
 include(ExternalProject)
 ExternalProject_Add(Metis
   URL http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
   URL_MD5 0
   SOURCE_DIR Metis
   BUILD_IN_SOURCE 1
   BUILD_COMMAND ${CMAKE_BUILD_TOOL}
   UPDATE_COMMAND 
   CONFIGURE_COMMAND ${CMAKE_BUILD_TOOL} config shared=1
 prefix=${CMAKE_INSTALL_PREFIX}/contrib/Metis
   INSTALL_COMMAND ${CMAKE_BUILD_TOOL} install
   INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/contrib/Metis
 )





 
 Notice: This UI Health Care e-mail (including attachments) is covered by
 the Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is
 confidential and may be legally privileged.  If you are not the intended
 recipient, you are hereby notified that any retention, dissemination,
 distribution, or copying of this communication is strictly prohibited.
  Please reply to the sender that you have received the message in error,
 then delete it.  Thank you.
 


-- 

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] need help fixing warning message... 3.0

2014-05-27 Thread J Decker 
patching latest source, bypassing my location test code and added

set( CMAKE_PLATFORM_NO_SONAME_SUPPORT ON )

then the patch seems to generate 'correct' commandlines... and the result
works.


On Tue, May 27, 2014 at 4:18 AM, J Decker d3c...@gmail.com wrote:




 On Tue, May 27, 2014 at 3:30 AM, Nils Gladitz nilsglad...@gmail.comwrote:

 On 05/27/2014 12:25 PM, J Decker wrote:

 Without modification
 target_link_libraries( ${target} ${target_lib} )

 generates a link command like this


 Yeah I think I got that part ... which is why I proposed modification.
 Or do you mean that is the result after applying the patch?

 sorry I can't apply a patch yet... I'll maybe work on that tomorrow



  Nils



-- 

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. v3.0.0-rc6-3353-gefcafba

2014-05-27 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  efcafba1d00668c6e7dc33b74ca7dc89f88901bf (commit)
   via  668e571d61c1d8e88b7893133e137a0a4eb62e35 (commit)
  from  65fa299f60cdd31f6d5d2053ca9888943bc2456c (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=efcafba1d00668c6e7dc33b74ca7dc89f88901bf
commit efcafba1d00668c6e7dc33b74ca7dc89f88901bf
Merge: 65fa299 668e571
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:24:11 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:24:11 2014 -0400

Merge topic 'GNUtoMS-vs-12' into next

668e571d GNUtoMS: Add support for VS 2013 (#14936)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=668e571d61c1d8e88b7893133e137a0a4eb62e35
commit 668e571d61c1d8e88b7893133e137a0a4eb62e35
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:05:57 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 09:24:26 2014 -0400

GNUtoMS: Add support for VS 2013 (#14936)

Add to the Platform/Windows-GNU module list of VS registry entries those
for VS 2013.  Also add the name vcvars64.bat used by VS 10 and above
for 64-bit tools.

diff --git a/Modules/Platform/Windows-GNU.cmake 
b/Modules/Platform/Windows-GNU.cmake
index 2bb7a20..872755c 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -151,6 +151,7 @@ macro(__windows_compiler_gnu_abi lang)
   find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars32.bat
 DOC Visual Studio vcvars32.bat
 PATHS
+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin
 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin
 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin
 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin
@@ -160,9 +161,10 @@ macro(__windows_compiler_gnu_abi lang)
 )
   set(CMAKE_GNUtoMS_ARCH x86)
 elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-  find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvarsamd64.bat
+  find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars64.bat vcvarsamd64.bat
 DOC Visual Studio vcvarsamd64.bat
 PATHS
+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/amd64
 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/amd64
 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/amd64
 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin/amd64

---

Summary of changes:
 Modules/Platform/Windows-GNU.cmake |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


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. v3.0.0-rc6-3358-gd6c6e9a

2014-05-27 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  d6c6e9aab34b01210487893ae2f65d84dbb96823 (commit)
   via  e7b7f675f81db488ac9c1367d8f73e6aceefb7a9 (commit)
   via  e21604f00f6119a96bd84a45c768fdbf37b9ad17 (commit)
   via  055da262f150b667fc2322df386b8e8fc4493351 (commit)
   via  0aee518ac668582aca554b4620ddb1182890b358 (commit)
  from  efcafba1d00668c6e7dc33b74ca7dc89f88901bf (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=d6c6e9aab34b01210487893ae2f65d84dbb96823
commit d6c6e9aab34b01210487893ae2f65d84dbb96823
Merge: efcafba e7b7f67
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:32:16 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 09:32:16 2014 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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. v3.0.0-rc6-3360-g762a215

2014-05-27 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  762a2154d6973eea7cb0b21ac09e216cde93a9d0 (commit)
   via  ca5d990f02b464f5b5033311d3712ffb02dbd54a (commit)
  from  d6c6e9aab34b01210487893ae2f65d84dbb96823 (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=762a2154d6973eea7cb0b21ac09e216cde93a9d0
commit 762a2154d6973eea7cb0b21ac09e216cde93a9d0
Merge: d6c6e9a ca5d990
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:34:07 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:34:07 2014 -0400

Merge topic 'compile-features-manual' into next

ca5d990f Help: Add a manual for compiler feature control.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca5d990f02b464f5b5033311d3712ffb02dbd54a
commit ca5d990f02b464f5b5033311d3712ffb02dbd54a
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Mar 18 23:50:18 2014 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 09:35:00 2014 -0400

Help: Add a manual for compiler feature control.

Link to it from the documentation of related properties, variables
and commands.

Extend the cmake-developer(7) documentation with notes on
extending feature support for compilers.

diff --git a/Help/command/target_compile_features.rst 
b/Help/command/target_compile_features.rst
index 9559600..a6503db 100644
--- a/Help/command/target_compile_features.rst
+++ b/Help/command/target_compile_features.rst
@@ -28,4 +28,5 @@ an ``IMPORTED`` target.
 Arguments to ``target_compile_features`` may use generator expressions
 with the syntax ``$...``.
 See the :manual:`cmake-generator-expressions(7)` manual for available
-expressions.
+expressions.  See the :manual:`cmake-compile-features(7)` manual for
+information on compile features.
diff --git a/Help/index.rst b/Help/index.rst
index a4abfbf..2d3f156 100644
--- a/Help/index.rst
+++ b/Help/index.rst
@@ -27,6 +27,7 @@ Reference Manuals
 
/manual/cmake-buildsystem.7
/manual/cmake-commands.7
+   /manual/cmake-compile-features.7
/manual/cmake-developer.7
/manual/cmake-generator-expressions.7
/manual/cmake-generators.7
diff --git a/Help/manual/cmake-compile-features.7.rst 
b/Help/manual/cmake-compile-features.7.rst
new file mode 100644
index 000..c014846
--- /dev/null
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -0,0 +1,297 @@
+.. cmake-manual-description: CMake Compile Features Reference
+
+cmake-compile-features(7)
+*
+
+.. only:: html or latex
+
+   .. contents::
+
+Introduction
+
+
+Project source code may depend on, or be conditional on, the availability
+of certain features of the compiler.  There are three use-cases which arise:
+`Compile Feature Requirements`_, `Optional Compile Features`_
+and `Conditional Compilation Options`_.
+
+While features are typically specified in programming language standards,
+CMake provides a primary user interface based on granular handling of
+the features, not the language standard that introduced the feature.
+
+The :prop_gbl:`CMAKE_C_KNOWN_FEATURES` and
+:prop_gbl:`CMAKE_CXX_KNOWN_FEATURES` global properties contain all the
+features known to CMake, regardless of compiler support for the feature.
+The :variable:`CMAKE_C_COMPILE_FEATURES` and
+:variable:`CMAKE_CXX_COMPILE_FEATURES` variables contain all features
+CMake knows are known to the compiler, regardless of language standard
+or compile flags needed to use them.
+
+Features known to CMake are named mostly following the same convention
+as the Clang feature test macros.  The are some execptions, such as
+CMake using ``cxx_final`` and ``cxx_override`` instead of the single
+``cxx_override_control`` used by Clang.
+
+Compile Feature Requirements
+
+
+Compile feature requirements may be specified with the
+:command:`target_compile_features` command.  For example, if a target must
+be compiled with compiler support for the
+:prop_gbl:`cxx_constexpr CMAKE_CXX_KNOWN_FEATURES` feature:
+
+.. code-block:: cmake
+
+  add_library(mylib requires_constexpr.cpp)
+  target_compile_features(mylib PRIVATE cxx_constexpr)
+
+In processing the requirement for the ``cxx_constexpr`` feature,
+:manual:`cmake(1)` will ensure that the in-use C++ compiler is capable
+of the feature, and will add any necessary flags such as ``-std=c++11``
+to the compile lines of C++ files in the ``mylib`` target.  A
+``FATAL_ERROR`` is issued if the compiler is not capable of the
+feature.
+
+The exact compile flags and language standard are deliberately not part
+of the user

[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3362-gb51d32e

2014-05-27 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  b51d32e34991244326e1bae7c54659738657a518 (commit)
   via  e971360feef6788f36bc9475ae217e67e21c0aff (commit)
  from  762a2154d6973eea7cb0b21ac09e216cde93a9d0 (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=b51d32e34991244326e1bae7c54659738657a518
commit b51d32e34991244326e1bae7c54659738657a518
Merge: 762a215 e971360
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:45:53 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:45:53 2014 -0400

Merge topic 'cpack-properties' into next

e971360f Utilities/Sphinx: Finish prop_inst domain object type


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e971360feef6788f36bc9475ae217e67e21c0aff
commit e971360feef6788f36bc9475ae217e67e21c0aff
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:43:23 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 09:44:56 2014 -0400

Utilities/Sphinx: Finish prop_inst domain object type

Mention it in our documentation, add it to cmRST, and sort it in
lexicographic order in the implementation.

diff --git a/Help/manual/cmake-developer.7.rst 
b/Help/manual/cmake-developer.7.rst
index 7f31970..f3af1e7 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -331,10 +331,10 @@ documentation:
  See the :manual:`cmake-policies(7)` manual
  and the :command:`cmake_policy` command.
 
-``prop_cache, prop_dir, prop_gbl, prop_sf, prop_test, prop_tgt``
- A CMake cache, directory, global, source file, test, or target
- property, respectively.  See the :manual:`cmake-properties(7)` manual
- and the :command:`set_property` command.
+``prop_cache, prop_dir, prop_gbl, prop_sf, prop_inst, prop_test, prop_tgt``
+ A CMake cache, directory, global, source file, installed file, test,
+ or target property, respectively.  See the :manual:`cmake-properties(7)`
+ manual and the :command:`set_property` command.
 
 ``variable``
  A CMake language variable.
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 7ff12dd..cca995b 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -39,7 +39,8 @@ cmRST::cmRST(std::ostream os, std::string const docroot):
   ModuleRST(^#\\[(=*)\\[\\.rst:$),
   CMakeRole((:cmake)?:(
 command|generator|variable|module|policy|
-prop_cache|prop_dir|prop_gbl|prop_sf|prop_test|prop_tgt|
+prop_cache|prop_dir|prop_gbl|prop_inst|prop_sf|
+prop_test|prop_tgt|
 manual
 ):`(*([^`]|[^` \t])*)([ \t]+[^`]*)?`),
   Substitution((^|[^A-Za-z0-9_])
diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 1076caa..2629bb3 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -142,10 +142,10 @@ _cmake_index_objs = {
 'prop_cache': _cmake_index_entry('cache property'),
 'prop_dir':   _cmake_index_entry('directory property'),
 'prop_gbl':   _cmake_index_entry('global property'),
+'prop_inst':  _cmake_index_entry('installed file property'),
 'prop_sf':_cmake_index_entry('source file property'),
 'prop_test':  _cmake_index_entry('test property'),
 'prop_tgt':   _cmake_index_entry('target property'),
-'prop_inst':  _cmake_index_entry('installed file property'),
 'variable':   _cmake_index_entry('variable'),
 }
 
@@ -270,10 +270,10 @@ class CMakeDomain(Domain):
 'prop_cache': ObjType('prop_cache', 'prop_cache'),
 'prop_dir':   ObjType('prop_dir',   'prop_dir'),
 'prop_gbl':   ObjType('prop_gbl',   'prop_gbl'),
+'prop_inst':  ObjType('prop_inst',  'prop_inst'),
 'prop_sf':ObjType('prop_sf','prop_sf'),
 'prop_test':  ObjType('prop_test',  'prop_test'),
 'prop_tgt':   ObjType('prop_tgt',   'prop_tgt'),
-'prop_inst':  ObjType('prop_inst',  'prop_inst'),
 'manual': ObjType('manual', 'manual'),
 }
 directives = {
@@ -286,10 +286,10 @@ class CMakeDomain(Domain):
 # 'prop_cache': CMakeObject,
 # 'prop_dir':   CMakeObject,
 # 'prop_gbl':   CMakeObject,
+# 'prop_inst':  CMakeObject,
 # 'prop_sf':CMakeObject,
 # 'prop_test':  CMakeObject,
 # 'prop_tgt':   CMakeObject,
-# 'prop_inst':  CMakeObject,
 # 'manual': CMakeObject,
 }
 roles = {
@@ -301,10 +301,10 @@ class CMakeDomain(Domain):
 'prop_cache': CMakeXRefRole(),
 'prop_dir':   CMakeXRefRole(),
 'prop_gbl':   CMakeXRefRole(),
+'prop_inst':

[Cmake-commits] CMake branch, master, updated. v3.0.0-rc6-964-g41a0fde

2014-05-27 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  41a0fde1c9d179108b2db8b111b6a0ea1c6d501e (commit)
   via  d74ed5431ac05b198c1a03992948a8c1502ab7d1 (commit)
  from  07994577fc6ae9d392a5da82188cf10f7d4b0ea0 (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=41a0fde1c9d179108b2db8b111b6a0ea1c6d501e
commit 41a0fde1c9d179108b2db8b111b6a0ea1c6d501e
Merge: 0799457 d74ed54
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:46:41 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:46:41 2014 -0400

Merge topic 'doc-file-command'

d74ed543 Help: Format and revise file() command documentation


---

Summary of changes:
 Help/command/file.rst |  444 +
 1 file changed, 266 insertions(+), 178 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. v3.0.0-rc6-962-g0799457

2014-05-27 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  07994577fc6ae9d392a5da82188cf10f7d4b0ea0 (commit)
   via  b8d6ab6040e23694e3486a3549dfa9d624dd6a61 (commit)
  from  6ca21345c85324e01b49975706bbac2bcde91267 (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=07994577fc6ae9d392a5da82188cf10f7d4b0ea0
commit 07994577fc6ae9d392a5da82188cf10f7d4b0ea0
Merge: 6ca2134 b8d6ab6
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:46:39 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:46:39 2014 -0400

Merge topic 'doc-CTEST_BUILD_FLAGS'

b8d6ab60 Help: describe CTEST_BUILD_FLAGS


---

Summary of changes:
 Help/command/ctest_build.rst |5 +
 1 file changed, 5 insertions(+)


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. v3.0.0-rc6-958-gc531552

2014-05-27 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  c5315524629bea99ccaaa4e0e666fe4918f66064 (commit)
   via  ca5d990f02b464f5b5033311d3712ffb02dbd54a (commit)
   via  b4d33f648465e0b4468cc20a1bbceb67e90fb65c (commit)
  from  4a67e9cd4122e668a6d0352e2a18a4aad6953d7d (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=c5315524629bea99ccaaa4e0e666fe4918f66064
commit c5315524629bea99ccaaa4e0e666fe4918f66064
Merge: 4a67e9c ca5d990
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:46:35 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:46:35 2014 -0400

Merge topic 'compile-features-manual'

ca5d990f Help: Add a manual for compiler feature control.
b4d33f64 Features: Add missing variable reference in docs.


---

Summary of changes:
 Help/command/target_compile_features.rst  |3 +-
 Help/index.rst|1 +
 Help/manual/cmake-compile-features.7.rst  |  297 +
 Help/manual/cmake-developer.7.rst |   45 
 Help/manual/cmake-generator-expressions.7.rst |4 +-
 Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst|4 +-
 Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst  |3 +-
 Help/prop_tgt/COMPILE_FEATURES.rst|3 +-
 Help/prop_tgt/CXX_EXTENSIONS.rst  |7 +
 Help/prop_tgt/CXX_STANDARD.rst|3 +
 Help/prop_tgt/CXX_STANDARD_REQUIRED.rst   |3 +
 Help/prop_tgt/C_EXTENSIONS.rst|7 +
 Help/prop_tgt/C_STANDARD.rst  |3 +
 Help/prop_tgt/C_STANDARD_REQUIRED.rst |3 +
 Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst  |4 +-
 Help/variable/CMAKE_CXX_COMPILE_FEATURES.rst  |3 +
 Help/variable/CMAKE_CXX_EXTENSIONS.rst|3 +
 Help/variable/CMAKE_CXX_STANDARD.rst  |3 +
 Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst |3 +
 Help/variable/CMAKE_C_COMPILE_FEATURES.rst|3 +
 Help/variable/CMAKE_C_EXTENSIONS.rst  |3 +
 Help/variable/CMAKE_C_STANDARD.rst|3 +
 Help/variable/CMAKE_C_STANDARD_REQUIRED.rst   |3 +
 Modules/WriteCompilerDetectionHeader.cmake|3 +
 24 files changed, 411 insertions(+), 6 deletions(-)
 create mode 100644 Help/manual/cmake-compile-features.7.rst


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. v3.0.0-rc6-960-g6ca2134

2014-05-27 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  6ca21345c85324e01b49975706bbac2bcde91267 (commit)
   via  9afcecaf32acb4333b33d46522f98457bfa8856d (commit)
  from  c5315524629bea99ccaaa4e0e666fe4918f66064 (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=6ca21345c85324e01b49975706bbac2bcde91267
commit 6ca21345c85324e01b49975706bbac2bcde91267
Merge: c531552 9afceca
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:46:38 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:46:38 2014 -0400

Merge topic 'revise-CTestTestTimeout'

9afcecaf Tests: Try to make CTestTestTimeout more robust


---

Summary of changes:
 Tests/CMakeLists.txt  |2 +-
 Tests/CTestTestTimeout/CMakeLists.txt |   12 
 Tests/CTestTestTimeout/check.cmake|9 -
 Tests/CTestTestTimeout/sleep.c|   21 +
 Tests/CTestTestTimeout/test.cmake.in  |   13 +
 Tests/CTestTestTimeout/timeout.c  |   18 --
 Tests/CTestTestTimeout/timeout.cmake  |2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)
 delete mode 100644 Tests/CTestTestTimeout/check.cmake
 create mode 100644 Tests/CTestTestTimeout/sleep.c
 delete mode 100644 Tests/CTestTestTimeout/timeout.c


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. v3.0.0-rc6-953-g03a3ee2

2014-05-27 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  03a3ee222b737a0e9d1678c7022c735b37d98fa5 (commit)
   via  d849800351a6ed91f3d6b149bb9e50aaa4c42a99 (commit)
  from  e7b7f675f81db488ac9c1367d8f73e6aceefb7a9 (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=03a3ee222b737a0e9d1678c7022c735b37d98fa5
commit 03a3ee222b737a0e9d1678c7022c735b37d98fa5
Merge: e7b7f67 d849800
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:46:32 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:46:32 2014 -0400

Merge topic 'variable_watch-no-allowed-access'

d8498003 variable_watch: Remove undocumented and redundant access type


---

Summary of changes:
 Help/release/dev/variable_watch-no-allowed-access.rst |8 
 Source/cmMakefile.cxx |   13 +
 Source/cmVariableWatch.cxx|1 -
 Source/cmVariableWatch.h  |1 -
 4 files changed, 9 insertions(+), 14 deletions(-)
 create mode 100644 Help/release/dev/variable_watch-no-allowed-access.rst


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. v3.0.0-rc6-3369-gd4e8422

2014-05-27 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  d4e8422435cdc05f3c2dd08878f8513ba7cf01c6 (commit)
   via  41a0fde1c9d179108b2db8b111b6a0ea1c6d501e (commit)
   via  07994577fc6ae9d392a5da82188cf10f7d4b0ea0 (commit)
   via  6ca21345c85324e01b49975706bbac2bcde91267 (commit)
   via  c5315524629bea99ccaaa4e0e666fe4918f66064 (commit)
   via  4a67e9cd4122e668a6d0352e2a18a4aad6953d7d (commit)
   via  03a3ee222b737a0e9d1678c7022c735b37d98fa5 (commit)
  from  b51d32e34991244326e1bae7c54659738657a518 (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=d4e8422435cdc05f3c2dd08878f8513ba7cf01c6
commit d4e8422435cdc05f3c2dd08878f8513ba7cf01c6
Merge: b51d32e 41a0fde
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:47:57 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 09:47:57 2014 -0400

Merge branch 'master' into next


---

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. v3.0.0-rc6-955-g4a67e9c

2014-05-27 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  4a67e9cd4122e668a6d0352e2a18a4aad6953d7d (commit)
   via  9ba91463e61b1e4ff5b3dcdea82981f65097e7dd (commit)
  from  03a3ee222b737a0e9d1678c7022c735b37d98fa5 (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=4a67e9cd4122e668a6d0352e2a18a4aad6953d7d
commit 4a67e9cd4122e668a6d0352e2a18a4aad6953d7d
Merge: 03a3ee2 9ba9146
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 09:46:33 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 09:46:33 2014 -0400

Merge topic 'dev/CMP0053-variable_watch'

9ba91463 tests: test CMP0053 in WARN mode when watching variables


---

Summary of changes:
 Source/cmMakefile.cxx  |8 +++-
 Source/cmMakefile.h|2 ++
 Tests/RunCMake/CMP0053/CMP0053-NEW-stderr.txt  |2 ++
 Tests/RunCMake/CMP0053/CMP0053-NEW.cmake   |8 
 Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt  |2 ++
 Tests/RunCMake/CMP0053/CMP0053-OLD.cmake   |8 
 Tests/RunCMake/CMP0053/CMP0053-WARN-stderr.txt |2 ++
 Tests/RunCMake/CMP0053/CMP0053-WARN.cmake  |6 ++
 Tests/RunCMake/{CMP0051 = CMP0053}/CMakeLists.txt |0
 Tests/RunCMake/CMP0053/RunCMakeTest.cmake  |5 +
 Tests/RunCMake/CMakeLists.txt  |1 +
 11 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/CMP0053/CMP0053-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0053/CMP0053-NEW.cmake
 create mode 100644 Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0053/CMP0053-OLD.cmake
 create mode 100644 Tests/RunCMake/CMP0053/CMP0053-WARN-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0053/CMP0053-WARN.cmake
 copy Tests/RunCMake/{CMP0051 = CMP0053}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/CMP0053/RunCMakeTest.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, next, updated. v3.0.0-rc6-3371-g9d2d4b9

2014-05-27 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  9d2d4b9c55d67418b9cb90e77af265f7d5f627ea (commit)
   via  b9beed9428cc493cae595ea3acf354ce528b67e4 (commit)
  from  d4e8422435cdc05f3c2dd08878f8513ba7cf01c6 (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=9d2d4b9c55d67418b9cb90e77af265f7d5f627ea
commit 9d2d4b9c55d67418b9cb90e77af265f7d5f627ea
Merge: d4e8422 b9beed9
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 10:21:16 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 10:21:16 2014 -0400

Merge topic 'fix-coverage-py' into next

b9beed94 Improvement to coverage.py source file search algorithm


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9beed9428cc493cae595ea3acf354ce528b67e4
commit b9beed9428cc493cae595ea3acf354ce528b67e4
Author: Roni Choudhury roni.choudh...@kitware.com
AuthorDate: Sat May 24 11:42:08 2014 -0400
Commit: Roni Choudhury roni.choudh...@kitware.com
CommitDate: Sat May 24 11:42:08 2014 -0400

Improvement to coverage.py source file search algorithm

If the coverage.py source file is not found in the source directory, the 
build
directory is first searched before raising an error.

This is necessary because it is a valid workflow to build a Python package 
from
source, then install this package to a virtualenv that lives in the build
directory.  Tests will run against this deployed package and therefore the
covered source files will be found in a subdirectory of the build 
directory, and
not anywhere in the source directory.

diff --git a/Source/CTest/cmParsePythonCoverage.cxx 
b/Source/CTest/cmParsePythonCoverage.cxx
index 2578bb8..68a6817 100644
--- a/Source/CTest/cmParsePythonCoverage.cxx
+++ b/Source/CTest/cmParsePythonCoverage.cxx
@@ -33,19 +33,25 @@ protected:
   atts[tagCount+1]  std::endl);
   this-CurFileName = this-Coverage.SourceDir + / +
  atts[tagCount+1];
-  FileLinesType curFileLines =
-this-Coverage.TotalCoverage[this-CurFileName];
   cmsys::ifstream fin(this-CurFileName.c_str());
   if(!fin)
   {
-cmCTestLog(this-CTest, ERROR_MESSAGE,
-   Python Coverage: Error opening   this-CurFileName
-std::endl);
-this-Coverage.Error++;
-break;
+this-CurFileName = this-Coverage.BinaryDir + / +
+   atts[tagCount+1];
+fin.open(this-CurFileName.c_str());
+if (!fin)
+{
+  cmCTestLog(this-CTest, ERROR_MESSAGE,
+ Python Coverage: Error opening   this-CurFileName
+  std::endl);
+  this-Coverage.Error++;
+  break;
+}
   }
 
   std::string line;
+  FileLinesType curFileLines =
+this-Coverage.TotalCoverage[this-CurFileName];
   curFileLines.push_back(-1);
   while(cmSystemTools::GetLineFromStream(fin, line))
   {

---

Summary of changes:
 Source/CTest/cmParsePythonCoverage.cxx |   20 +---
 1 file changed, 13 insertions(+), 7 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. v3.0.0-rc6-3376-g70459c9

2014-05-27 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  70459c917e6cfbe265d58dba229aa49b22eac74f (commit)
   via  58f7baab146cda9e11976d8362b8476d8ee5f264 (commit)
   via  444f88014624b369f356d27c228a4ad98656e7f4 (commit)
   via  836a28d5376cadd8da2febc8b0757283d7ecb182 (commit)
   via  4ad6dacede10ce369c0e7bd0d4c8fe89d48cf4de (commit)
  from  9d2d4b9c55d67418b9cb90e77af265f7d5f627ea (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=70459c917e6cfbe265d58dba229aa49b22eac74f
commit 70459c917e6cfbe265d58dba229aa49b22eac74f
Merge: 9d2d4b9 58f7baa
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 10:41:10 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 10:41:10 2014 -0400

Merge topic 'FindFreetype-updates' into next

58f7baab FindFreetype: Indent with 2 spaces instead of 4
444f8801 FindFreetype: Use lower-case name in call to FPHSA
836a28d5 FindFreetype: Move PATH_SUFFIXES argument for more consistency
4ad6dace FindFreetype: Add newlines to reduce code width


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f7baab146cda9e11976d8362b8476d8ee5f264
commit 58f7baab146cda9e11976d8362b8476d8ee5f264
Author: Taylor Holberton taylorcholber...@gmail.com
AuthorDate: Sat May 24 21:38:43 2014 -0700
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 10:42:10 2014 -0400

FindFreetype: Indent with 2 spaces instead of 4

This is more consistent with style elsewhere.

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 8e48b65..7d46d15 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -124,23 +124,23 @@ elseif(EXISTS 
${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h)
 endif()
 
 if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
-file(STRINGS ${FREETYPE_H} freetype_version_str
- REGEX ^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$)
+  file(STRINGS ${FREETYPE_H} freetype_version_str
+   REGEX ^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$)
 
-unset(FREETYPE_VERSION_STRING)
-foreach(VPART MAJOR MINOR PATCH)
-foreach(VLINE ${freetype_version_str})
-if(VLINE MATCHES ^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t 
]+([0-9]+)$)
-set(FREETYPE_VERSION_PART ${CMAKE_MATCH_1})
-if(FREETYPE_VERSION_STRING)
-set(FREETYPE_VERSION_STRING 
${FREETYPE_VERSION_STRING}.${FREETYPE_VERSION_PART})
-else()
-set(FREETYPE_VERSION_STRING ${FREETYPE_VERSION_PART})
-endif()
-unset(FREETYPE_VERSION_PART)
-endif()
-endforeach()
+  unset(FREETYPE_VERSION_STRING)
+  foreach(VPART MAJOR MINOR PATCH)
+foreach(VLINE ${freetype_version_str})
+  if(VLINE MATCHES ^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$)
+set(FREETYPE_VERSION_PART ${CMAKE_MATCH_1})
+if(FREETYPE_VERSION_STRING)
+  set(FREETYPE_VERSION_STRING 
${FREETYPE_VERSION_STRING}.${FREETYPE_VERSION_PART})
+else()
+  set(FREETYPE_VERSION_STRING ${FREETYPE_VERSION_PART})
+endif()
+unset(FREETYPE_VERSION_PART)
+  endif()
 endforeach()
+  endforeach()
 endif()
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=444f88014624b369f356d27c228a4ad98656e7f4
commit 444f88014624b369f356d27c228a4ad98656e7f4
Author: Taylor Holberton taylorcholber...@gmail.com
AuthorDate: Sat May 24 21:37:28 2014 -0700
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 10:42:10 2014 -0400

FindFreetype: Use lower-case name in call to FPHSA

Use 'find_package_handle_standard_args' because lower-case style is
now preferred.

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 95ecaf9..8e48b65 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -147,7 +147,8 @@ endif()
 # handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
 # all listed variables are TRUE
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+
+find_package_handle_standard_args(
   Freetype
   REQUIRED_VARS
 FREETYPE_LIBRARY

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=836a28d5376cadd8da2febc8b0757283d7ecb182
commit 836a28d5376cadd8da2febc8b0757283d7ecb182
Author: Taylor Holberton taylorcholber...@gmail.com
AuthorDate: Sat May 24 21:35:39 2014 -0700
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 10:42:10 2014 -0400

FindFreetype:

[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3378-gcd91e99

2014-05-27 Thread Ben Boeckel 
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  cd91e99eeb02ec15a65deb5b2d840895f1032fad (commit)
   via  88962807c25a928065cb92d0dd3ccfae84569689 (commit)
  from  70459c917e6cfbe265d58dba229aa49b22eac74f (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=cd91e99eeb02ec15a65deb5b2d840895f1032fad
commit cd91e99eeb02ec15a65deb5b2d840895f1032fad
Merge: 70459c9 8896280
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 27 14:32:24 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 14:32:24 2014 -0400

Merge topic 'revert/old-backtrace-performance' into next

88962807 revert old backtrace-performance changes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88962807c25a928065cb92d0dd3ccfae84569689
commit 88962807c25a928065cb92d0dd3ccfae84569689
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Tue May 27 14:31:22 2014 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Tue May 27 14:31:29 2014 -0400

revert old backtrace-performance changes

diff --git a/Source/cmComputeTargetDepends.cxx 
b/Source/cmComputeTargetDepends.cxx
index 6f36940..eb62455 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -386,10 +386,15 @@ void cmComputeTargetDepends::AddTargetDepend(int 
depender_index,
   e  The dependency target \   dependee_name
  \ of target \  depender-GetName()  \ does not exist.;
 
-  cmListFileBacktrace backtrace =
+  cmListFileBacktrace nullBacktrace;
+  cmListFileBacktrace const* backtrace =
 depender-GetUtilityBacktrace(dependee_name);
+  if(!backtrace)
+{
+backtrace = nullBacktrace;
+}
 
-  cm-IssueMessage(messageType, e.str(), backtrace);
+  cm-IssueMessage(messageType, e.str(), *backtrace);
   }
 }
 
diff --git a/Source/cmExportBuildFileGenerator.cxx 
b/Source/cmExportBuildFileGenerator.cxx
index 647bbca..6c8ebb6 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -46,7 +46,6 @@ bool 
cmExportBuildFileGenerator::GenerateMainFile(std::ostream os)
   {
   cmOStringStream e;
   e  given target \  te-GetName()  \ more than once.;
-  this-Backtrace.MakeRelative();
   this-Makefile-GetCMakeInstance()
   -IssueMessage(cmake::FATAL_ERROR, e.str(), this-Backtrace);
   return false;
@@ -318,7 +317,6 @@ cmExportBuildFileGenerator
   e  If the required target is not easy to reference in this call, 
  consider using the APPEND option with multiple separate calls.;
 
-  this-Backtrace.MakeRelative();
   this-Makefile-GetCMakeInstance()
   -IssueMessage(cmake::FATAL_ERROR, e.str(), this-Backtrace);
 }
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx 
b/Source/cmGeneratorExpressionDAGChecker.cxx
index 8882d5f..7f8e694 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -91,11 +91,9 @@ void cmGeneratorExpressionDAGChecker::ReportError(
expr  \n
Self reference on target \
context-HeadTarget-GetName()  \.\n;
-cmListFileBacktrace backtrace = parent-Backtrace;
-backtrace.MakeRelative();
 context-Makefile-GetCMakeInstance()
   -IssueMessage(cmake::FATAL_ERROR, e.str(),
- backtrace);
+  parent-Backtrace);
 return;
 }
 
@@ -104,7 +102,6 @@ void cmGeneratorExpressionDAGChecker::ReportError(
   e  Error evaluating generator expression:\n
  expr  \n
  Dependency loop found.;
-  context-Backtrace.MakeRelative();
   context-Makefile-GetCMakeInstance()
 -IssueMessage(cmake::FATAL_ERROR, e.str(),
 context-Backtrace);
@@ -118,11 +115,9 @@ void cmGeneratorExpressionDAGChecker::ReportError(
  
(parent-Content ? parent-Content-GetOriginalExpression() : expr)
\n;
-cmListFileBacktrace backtrace = parent-Backtrace;
-backtrace.MakeRelative();
 context-Makefile-GetCMakeInstance()
   -IssueMessage(cmake::FATAL_ERROR, e.str(),
- backtrace);
+  parent-Backtrace);
 parent = parent-Parent;
 ++loopStep;
 }
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx 
b/Source/cmGeneratorExpressionEvaluator.cxx
index 33315c6..0b357f6 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -40,7 +40,6 @@ void reportError(cmGeneratorExpressionContext *context,
   e  Error evaluating generator expression:\n
  expr  \n
  result;
-

[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3388-gab0a98c

2014-05-27 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  ab0a98c2c8840df13671fbc50e395a3f5083bf8c (commit)
   via  1cd375272997cb58f0c51647cf199e4fd4eef678 (commit)
   via  326d15a3294e3b43de534130a4b655ddb454fbfb (commit)
  from  6b39c8f83cf57b9196e0477d84bbe4c2b5b7ce93 (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=ab0a98c2c8840df13671fbc50e395a3f5083bf8c
commit ab0a98c2c8840df13671fbc50e395a3f5083bf8c
Merge: 6b39c8f 1cd3752
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 16:21:41 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 16:21:41 2014 -0400

Merge topic 'fix-cache-self-assignment' into next

1cd37527 cmCacheManager: Avoid cache entry self-assignment
326d15a3 cmake: Tolerate missing HELPSTRING on compiler change

diff --cc Source/cmake.cxx
index f5ffaba,4f14d73..60e92a0
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@@ -1233,10 -1228,13 +1233,13 @@@ int cmake::HandleDeleteCacheVariables(c
  i++;
  save.value = *i;
  warning  *i  \n;
 -if(ci.Find(save.key.c_str()))
 +if(ci.Find(save.key))
{
save.type = ci.GetType();
-   save.help = ci.GetProperty(HELPSTRING);
+   if(const char* help = ci.GetProperty(HELPSTRING))
+ {
+ save.help = help;
+ }
}
  saved.push_back(save);
  }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cd375272997cb58f0c51647cf199e4fd4eef678
commit 1cd375272997cb58f0c51647cf199e4fd4eef678
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 16:09:43 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 16:12:05 2014 -0400

cmCacheManager: Avoid cache entry self-assignment

Since commit bef93dc5 (Couple of changes: cache variables now have a map
of properties, 2002-09-11) the cmCacheManager::AddCacheDefinition method
accesses its map entry by reference.  However, the commit left the
original entry assignment at the end of the method.  With Apple Clang
5.1 and libc++ this self-assignment destroys the cache entry property
map.

Drop the self assignment.  Also drop the condition around the call to
UnwatchUnusedCli since it was a self-comparison that must always have
been true.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 9e0064e..cc9fa57 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -750,11 +750,7 @@ void cmCacheManager::AddCacheEntry(const char* key,
 }
   e.SetProperty(HELPSTRING, helpString? helpString :
 (This variable does not exist and should not be used));
-  if (this-Cache[key].Value == e.Value)
-{
-this-CMakeInstance-UnwatchUnusedCli(key);
-}
-  this-Cache[key] = e;
+  this-CMakeInstance-UnwatchUnusedCli(key);
 }
 
 bool cmCacheManager::CacheIterator::IsAtEnd() const

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=326d15a3294e3b43de534130a4b655ddb454fbfb
commit 326d15a3294e3b43de534130a4b655ddb454fbfb
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 16:03:51 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 16:11:04 2014 -0400

cmake: Tolerate missing HELPSTRING on compiler change

Teach cmake::HandleDeleteCacheVariables to tolerate a missing HELPSTRING
(NULL pointer) when saving cache entries.  In the absence of other bugs
this should not be possible, but avoid the crash just in case.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index abbabe7..4f14d73 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1231,7 +1231,10 @@ int cmake::HandleDeleteCacheVariables(const char* var)
 if(ci.Find(save.key.c_str()))
   {
   save.type = ci.GetType();
-  save.help = ci.GetProperty(HELPSTRING);
+  if(const char* help = ci.GetProperty(HELPSTRING))
+{
+save.help = help;
+}
   }
 saved.push_back(save);
 }

---

Summary of changes:
 Source/cmCacheManager.cxx |6 +-
 Source/cmake.cxx  |5 -
 2 files changed, 5 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, next, updated. v3.0.0-rc6-3390-g4021498

2014-05-27 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  4021498fbed20940dd1b0f66bae82291ad25f8a5 (commit)
   via  f9b7108f0535dc329ca4e1eac435234f33744e34 (commit)
  from  ab0a98c2c8840df13671fbc50e395a3f5083bf8c (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=4021498fbed20940dd1b0f66bae82291ad25f8a5
commit 4021498fbed20940dd1b0f66bae82291ad25f8a5
Merge: ab0a98c f9b7108
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 27 16:29:17 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 27 16:29:17 2014 -0400

Merge topic 'fix-coverage-py' into next

f9b7108f Coverage results from coverage.py were off by one


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9b7108f0535dc329ca4e1eac435234f33744e34
commit f9b7108f0535dc329ca4e1eac435234f33744e34
Author: Zach Mullen zach.mul...@kitware.com
AuthorDate: Tue May 27 15:44:46 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 27 16:28:12 2014 -0400

Coverage results from coverage.py were off by one

The cobertura format uses line numbers indexed by one, and CTest uses a 
vector (0-indexed) to store them.

diff --git a/Source/CTest/cmParsePythonCoverage.cxx 
b/Source/CTest/cmParsePythonCoverage.cxx
index 68a6817..817b8dc 100644
--- a/Source/CTest/cmParsePythonCoverage.cxx
+++ b/Source/CTest/cmParsePythonCoverage.cxx
@@ -79,11 +79,11 @@ protected:
   curNumber = atoi(atts[tagCount+1]);
 }
 
-if(curHits  -1  curNumber  -1)
+if(curHits  -1  curNumber  0)
 {
   FileLinesType curFileLines =
 this-Coverage.TotalCoverage[this-CurFileName];
-  curFileLines[curNumber] = curHits;
+  curFileLines[curNumber-1] = curHits;
   break;
 }
 ++tagCount;

---

Summary of changes:
 Source/CTest/cmParsePythonCoverage.cxx |4 ++--
 1 file 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, master, updated. v3.0.0-rc6-965-g960f140

2014-05-27 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  960f140d19c9432f5e901cc2a1f24725f6fbc83e (commit)
  from  41a0fde1c9d179108b2db8b111b6a0ea1c6d501e (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=960f140d19c9432f5e901cc2a1f24725f6fbc83e
commit 960f140d19c9432f5e901cc2a1f24725f6fbc83e
Author: Kitware Robot kwro...@kitware.com
AuthorDate: Wed May 28 00:01:08 2014 -0400
Commit: Kitware Robot kwro...@kitware.com
CommitDate: Wed May 28 00:01:08 2014 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 659b695..c9ae7aa 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 0)
-set(CMake_VERSION_PATCH 20140527)
+set(CMake_VERSION_PATCH 20140528)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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