[cmake-developers] [CMake 0013893]: CMAKE_OSX_SYSROOT overwritten to /

2013-02-05 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=13893 
== 
Reported By:gnzlbg
Assigned To:
== 
Project:CMake
Issue ID:   13893
Category:   CMake
Reproducibility:always
Severity:   major
Priority:   urgent
Status: new
== 
Date Submitted: 2013-02-05 05:59 EST
Last Modified:  2013-02-05 05:59 EST
== 
Summary:CMAKE_OSX_SYSROOT overwritten to /
Description: 
CMAKE_OSX_SYSROOT is overwritten to / at some point.

Steps to Reproduce: 
When trying to configure Paraview 3.98.0 in Mac OS X 10.8.2 cmake fails. The
following minimal example shows the issue. 

Step 1) Execute:

cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 
-DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk

cmake complains instantaneously that the deployment target 10.7 and the SDK
Version 10.8 do not match. Everything fine. 

Step 2) Now execute: 

cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 
-DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk

Configure starts and at some point:

- Checking support for C++ explicit template instantiation
CMake Error at
/usr/local/Cellar/cmake/2.8.10.1/share/cmake/Modules/Platform/Darwin.cmake:190
(message):
  CMAKE_OSX_DEPLOYMENT_TARGET is '10.8' but CMAKE_OSX_SYSROOT:

   /

  is not set to a MacOSX SDK with a recognized version.  Either set
  CMAKE_OSX_SYSROOT to a valid SDK or set CMAKE_OSX_DEPLOYMENT_TARGET to
  empty.
Call Stack (most recent call first):
 
/usr/local/Cellar/cmake/2.8.10.1/share/cmake/Modules/CMakeSystemSpecificInformation.cmake:36
(include)
  CMakeLists.txt:2 (PROJECT)


CMake Error: Internal CMake error, TryCompile configure of cmake failed
-- Configuring incomplete, errors occurred!

Somehow CMAKE_OSX_SYSROOT has been overwritten.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-02-05 05:59 gnzlbg 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 0013894]: Ninja generator uses relative paths for source files

2013-02-05 Thread Mantis Bug Tracker

The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=13894 
== 
Reported By:Mika Fischer
Assigned To:
== 
Project:CMake
Issue ID:   13894
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2013-02-05 16:37 EST
Last Modified:  2013-02-05 16:37 EST
== 
Summary:Ninja generator uses relative paths for source files
Description: 
This makes it unnecessarily difficult for tools parsing the generated errors to
find the referenced file. In particular, jumping to error locations in vim only
works when the current directory is the root of the build directory, otherwise
the relative paths in the error messages point to the wrong location.

The Unix Makefile generator uses absolute filenames for source files and thus
does not suffer from this.

If there's not a strong reason for the current behavior, I would suggest to also
use absolute filenames (at least) for source files in the Ninja generator.

A patch that fixes this for me is attached.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2013-02-05 16:37 Mika Fischer   New Issue
2013-02-05 16:37 Mika Fischer   File Added: cmake-ninja-absolute-filenames.patch
   
==

--

Powered by www.kitware.com

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

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


[CMake] CMake won't find OpenCV properly

2013-02-05 Thread dustXman
Hey there,

I am working on a project with CMake and OpenCV (CUDA and QT too, but that
is another story).
I am trying to get the FIND_PACKAGE (OpenCV REQUIRED) line working, but
unfortunately this line is not exactly working.
Although I pointed  OpenCV_DIR to H:/opencv/build/x86/vc10/lib
(manually) which includes my desired opencv-libs and get a OpenCV_FOUND
the OpenCV_LIBS will point to some files like
H:/opencv/build/lib/opencv_XXX243d.lib. In this folder are not the desired
libs!
I found that this variable is set in OpenCVConfig.cmake and almost copied
from OpenCV_LIBS_DBG and OpenCV_LIBS_OPT where the file path is already
wrong.

But I can't find the point where those variables are set or find the reason
why they are like that!
Some ideas?

dustXman



--
View this message in context: 
http://cmake.3232098.n2.nabble.com/CMake-won-t-find-OpenCV-properly-tp7583103.html
Sent from the CMake mailing list archive at Nabble.com.
--

Powered by www.kitware.com

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

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

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


[CMake] Is INSTALL_RPATH Meant to be Relative to CMAKE_INSTALL_PREFIX?

2013-02-05 Thread David Narvaez
Hi all,

I found code that sets LIB_INSTALL_DIR to a relative path (lib or
lib64), then later calls FindKDE4Internal.cmake where
CMAKE_INSTALL_RPATH is set to LIB_INSTALL_DIR and ultimatelysets the
rpath of a library to something containing the relative path lib.
Was that relative path meant to be relative to CMAKE_INSTALL_PREFIX?
It does look like the software in question and FindKDE4Internal.cmake
expect it to be relative to the prefix. I'm attaching a patch that
takes the prefix into account when creating the rpath and solved my
issue of having a relative rpath component.

Thanks in advance for your clarification.

David E. Narváez


_cmake-install_rpath.patch
Description: Binary data
--

Powered by www.kitware.com

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

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

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

[CMake] Compatibility between cmake-based directives and autoconf-based directives

2013-02-05 Thread DRypl
Is there a way how to avoid problems with different declarations of
directives depending whether
using autoconf (for a library) and cmake (for my application using that
library). For example autoconf
declares #define HAVE_UNISTD_H 1 while cmake declares #define
HAVE_UNISTD_H.
Using #cmakedefine01 instead of #cmakedefine does not solve the problem
because statement
#define HAVE_UNISTD_H 0 is apparently something else than #undef
HAVE_UNISTD_H (and the 
library is using preprocessing checks as #ifdef HAVE_UNISTD_H). I also did
not find solution in autoconf. 
Should the variable be defined using AC_DEFINE statement, I can use
AC_DEFINE(HAVE_UNISTD_H,,), 
instead of simple AC_DEFINE(HAVE_UNISTD_H). This will produce #define
HAVE_UNISTD_H (which is compatible with #cmakedefine). The problem is
however, that autoconf configure script for the library relies on  
AC_HEADER_STDC (thus not processing explicitly HAVE_UNISTD_H) without a
chance to choose 
which version of AC_DEFINE to use. 

Is there a way out? 

Thanks for help.

Daniel Rypl



--
View this message in context: 
http://cmake.3232098.n2.nabble.com/Compatibility-between-cmake-based-directives-and-autoconf-based-directives-tp7583105.html
Sent from the CMake mailing list archive at Nabble.com.
--

Powered by www.kitware.com

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

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

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


[CMake] Running CPack and ignore exit codes

2013-02-05 Thread NoRulez
Hi,

when i run cpack, then it breaks after the first error.

Is there a way (For NMake for example) to run nmake /I to ignore exit codes 
and build as much as possible?

Thanks in advance
--

Powered by www.kitware.com

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

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

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


[CMake] CMAKE_OSX_ variables lacking documentation

2013-02-05 Thread Kent Williams
I was looking for documentation in the CMake manual for
CMAKE_OSX_ARCHITECTURES.  This is a list of architectures, the possible
choices are:

i386;x86_64;ppc;ppc64

But this is not mentioned in the CMake documentation.  Shouldn't it be?
--

Powered by www.kitware.com

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

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

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

[CMake] Building CMake 2.8.10.2 -- package created named cmake-2.8.10.2-Darwin-i386.dmg?

2013-02-05 Thread Kent Williams
Building on OS X 10.7.5 with XCode 4.5.2
Compiling with default compiler Apple clang version 4.1
(tags/Apple/clang-421.11.66)

The packages available for download on cmake.org are named
http://www.cmake.org/files/v2.8/cmake-2.8.10.2-Darwin64-universal.dmg

My question is this: how is the architecture name chosen? Why, in this
case, is it wrong?
--

Powered by www.kitware.com

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

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

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

Re: [CMake] Building CMake 2.8.10.2 -- package created named cmake-2.8.10.2-Darwin-i386.dmg?

2013-02-05 Thread Jean-Christophe Fillion-Robin
Hi Kent,

Probably because the CPACK_SYSTEM_NAME is explicitly specified. See
http://cmake.org/gitweb?p=cmake.git;a=blob;f=Utilities/Release/dashmacmini5_release.cmake;h=36b095287e80d26ed1b684b6c1a69d9bda1963ba;hb=HEAD#l19

Hth
Jc


On Tue, Feb 5, 2013 at 9:47 AM, Kent Williams nkwmailingli...@gmail.comwrote:

 Building on OS X 10.7.5 with XCode 4.5.2
 Compiling with default compiler Apple clang version 4.1
 (tags/Apple/clang-421.11.66)

 The packages available for download on cmake.org are named
 http://www.cmake.org/files/v2.8/cmake-2.8.10.2-Darwin64-universal.dmg

 My question is this: how is the architecture name chosen? Why, in this
 case, is it wrong?

 --

 Powered by www.kitware.com

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

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

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




-- 
+1 919 869 8849
--

Powered by www.kitware.com

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

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

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

Re: [CMake] Building CMake 2.8.10.2 -- package created named cmake-2.8.10.2-Darwin-i386.dmg?

2013-02-05 Thread David Cole
What do you mean by it's wrong?

It's a universal binary with x86_64 being one of them.


On Feb 5, 2013, at 10:04 AM, Jean-Christophe Fillion-Robin 
jchris.filli...@kitware.com wrote:

 Hi Kent, 
 
 Probably because the CPACK_SYSTEM_NAME is explicitly specified. See 
 http://cmake.org/gitweb?p=cmake.git;a=blob;f=Utilities/Release/dashmacmini5_release.cmake;h=36b095287e80d26ed1b684b6c1a69d9bda1963ba;hb=HEAD#l19
 
 Hth
 Jc
 
 
 On Tue, Feb 5, 2013 at 9:47 AM, Kent Williams nkwmailingli...@gmail.com 
 wrote:
 Building on OS X 10.7.5 with XCode 4.5.2
 Compiling with default compiler Apple clang version 4.1 
 (tags/Apple/clang-421.11.66) 
 
 The packages available for download on cmake.org are named 
 http://www.cmake.org/files/v2.8/cmake-2.8.10.2-Darwin64-universal.dmg
 
 My question is this: how is the architecture name chosen? Why, in this case, 
 is it wrong?
 
 --
 
 Powered by www.kitware.com
 
 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html
 
 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ
 
 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake
 
 
 
 -- 
 +1 919 869 8849
 --
 
 Powered by www.kitware.com
 
 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html
 
 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ
 
 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake
--

Powered by www.kitware.com

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

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

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

Re: [CMake] Building CMake 2.8.10.2 -- package created named cmake-2.8.10.2-Darwin-i386.dmg?

2013-02-05 Thread Kent Williams
I meant that when I build cmake and then ran 'make package' it cmake out
i386, even though by default it only generates 64-bit binaries.

Jean-Christophe pointed out that on Kitware's builds they override this
with a better CPACK_SYSTEM_NAME.

And the reason it says i386 is that CPACK_SYSTEM_NAME defaults to the
output of uname -p which on OS X 10.7.5 is 'i386'

So CMake is behaving as documented, and OS X is wrong ;-) Quelle Surprise!


On Tue, Feb 5, 2013 at 9:08 AM, David Cole dlrd...@aol.com wrote:

 What do you mean by it's wrong?

 It's a universal binary with x86_64 being one of them.


 On Feb 5, 2013, at 10:04 AM, Jean-Christophe Fillion-Robin 
 jchris.filli...@kitware.com wrote:

 Hi Kent,

 Probably because the CPACK_SYSTEM_NAME is explicitly specified. See
 http://cmake.org/gitweb?p=cmake.git;a=blob;f=Utilities/Release/dashmacmini5_release.cmake;h=36b095287e80d26ed1b684b6c1a69d9bda1963ba;hb=HEAD#l19

 Hth
 Jc


 On Tue, Feb 5, 2013 at 9:47 AM, Kent Williams 
 nkwmailingli...@gmail.comwrote:

 Building on OS X 10.7.5 with XCode 4.5.2
 Compiling with default compiler Apple clang version 4.1
 (tags/Apple/clang-421.11.66)

 The packages available for download on cmake.org are named
 http://www.cmake.org/files/v2.8/cmake-2.8.10.2-Darwin64-universal.dmg

 My question is this: how is the architecture name chosen? Why, in this
 case, is it wrong?

 --

 Powered by www.kitware.com

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

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

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




 --
 +1 919 869 8849

 --

 Powered by www.kitware.com

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

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

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


--

Powered by www.kitware.com

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

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

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

[CMake] FindProtobuf error: _protobuf_include_path empty

2013-02-05 Thread Antonio Mancina
Hi all,

I've been fighting against this error for the last two hours.

When I try to setup a cmake-based project which builds some protobuf
related stuff, something strange happens.

My sample cmake directives follow:


find_package(Protobuf REQUIRED)

include_directories(${PROTOBUF_INCLUDE_DIRS})

PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS
${CMAKE_SRC_DIR}/Libraries/FileA.proto
${CMAKE_SRC_DIR}/Libraries/FileB.proto
)

add_library(MyLibrary SHARED
${PROTO_SRCS}
)

target_link_libraries(MyLibrary
${PROTOBUF_LIBRARIES}
)


When building this code, the build system was silently failing at building
the pb.h and pb.cc files. I followed all the code path within the module
and found that the problem is related to the _protobuf_include_path not
being given any value before the PROBUF_GENERATE_CPP call, so that the row

list(APPEND _protobuf_include_path -I ${ABS_PATH})

translates to

-I ;/the/path/in/abs_path

with the semi-colon between the -I and the path. This gives rise to
problems in protoc invocation.

I solved this by introducing the following if-then-else:

list(LENGTH _protobuf_include_path _list_num)
if(${_list_num} EQUAL 0)
set(_protobuf_include_path -I ${ABS_PATH})
else()
list(APPEND _protobuf_include_path -I ${ABS_PATH})
endif()

but I'd like to understand what I'm doing wrong and why I'm seeing this.

Thanks all!

A.
--

Powered by www.kitware.com

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

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

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

Re: [CMake] Building CMake 2.8.10.2 -- package created named cmake-2.8.10.2-Darwin-i386.dmg?

2013-02-05 Thread Sean McBride
On Tue, 5 Feb 2013 09:22:35 -0600, Kent Williams said:

And the reason it says i386 is that CPACK_SYSTEM_NAME defaults to the
output of uname -p which on OS X 10.7.5 is 'i386'

So CMake is behaving as documented, and OS X is wrong ;-) Quelle Surprise!

OS X returns 'i386' for 'uname -p' deliberately.  I don't have a link handy, 
but when doing the 64 bit transition years ago, Apple tried to change it to 
x86_64 but way too many things broke, expecting the broad family type (ex: ppc, 
arm, intel).  Perhaps 'uname -m' is more to your liking...

Cheers,

-- 

Sean McBride, B. Eng s...@rogue-research.com
Rogue Researchwww.rogue-research.com 
Mac Software Developer  Montréal, Québec, Canada


--

Powered by www.kitware.com

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

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

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


Re: [CMake] Building CMake 2.8.10.2 -- package created named cmake-2.8.10.2-Darwin-i386.dmg?

2013-02-05 Thread Jean-Christophe Fillion-Robin
Few pointers talking about the issue:
  - http://yourmacguy.wordpress.com/2009/08/24/boot-snow-leopard-64-bit/
  - http://arstechnica.com/apple/2009/08/mac-os-x-10-6/5/

Hth
Jc


On Tue, Feb 5, 2013 at 11:00 AM, Sean McBride s...@rogue-research.comwrote:

 On Tue, 5 Feb 2013 09:22:35 -0600, Kent Williams said:

 And the reason it says i386 is that CPACK_SYSTEM_NAME defaults to the
 output of uname -p which on OS X 10.7.5 is 'i386'
 
 So CMake is behaving as documented, and OS X is wrong ;-) Quelle Surprise!

 OS X returns 'i386' for 'uname -p' deliberately.  I don't have a link
 handy, but when doing the 64 bit transition years ago, Apple tried to
 change it to x86_64 but way too many things broke, expecting the broad
 family type (ex: ppc, arm, intel).  Perhaps 'uname -m' is more to your
 liking...

 Cheers,

 --
 
 Sean McBride, B. Eng s...@rogue-research.com
 Rogue Researchwww.rogue-research.com
 Mac Software Developer  Montréal, Québec, Canada


 --

 Powered by www.kitware.com

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

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

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




-- 
+1 919 869 8849
--

Powered by www.kitware.com

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

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

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

[CMake] Release date for CMake 2.8.11?

2013-02-05 Thread NoRulez
Hi,

does anybody know the new release date for CMake 2.8.11?
In Mantis the date was scheduled for 2013-01-30.

Thanks in advance
--

Powered by www.kitware.com

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

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

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


Re: [CMake] When should I use add_subdirectory and when ExternalProject?

2013-02-05 Thread Alexander Neundorf
On Monday 04 February 2013, David Cole wrote:
 The OpenChemistry project ( https://github.com/OpenChemistry/openchemistry
 ) is a very good example of a SuperBuild project that builds all of its
 external dependencies via ExternalProject, and then all of its git
 submodules (internal dependencies perhaps ?) also via ExternalProject.
 
 They use CMAKE_PREFIX_PATH both as a place to install all of the built
 components, and as a place for find_package to find stuff that was built
 by a previous ExternalProject_Add call.
 
 Study how they do stuff in their CMakeLists files and then get back to us
 here with more questions.

one thing I had trouble with is related to the install step.

With externalProject the install step happens at build time.
If shared libraries are involved, the install destination should be the 
correct and final install destination, so that the RPATH of using projects 
will point to the correct location.
This means that at build time I need to have the permissions to write to the 
final install destination (e.g. /opt/), i.e. typically root.

Is this correct or am I missing something ?

Alex
--

Powered by www.kitware.com

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

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

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


Re: [CMake] Is INSTALL_RPATH Meant to be Relative to CMAKE_INSTALL_PREFIX?

2013-02-05 Thread Alexander Neundorf
On Tuesday 05 February 2013, David Narvaez wrote:
 Hi all,
 
 I found code that sets LIB_INSTALL_DIR to a relative path (lib or
 lib64), then later calls FindKDE4Internal.cmake where
 CMAKE_INSTALL_RPATH is set to LIB_INSTALL_DIR and ultimatelysets the
 rpath of a library to something containing the relative path lib.

I know this was the case at some point in I think the frameworks branch of 
kdelibs, but this was wrong, and I think it has been fixed.
Or where did you see this ?

The install rpath must be an absolute path, or if you want it to be relative 
to the location of the ELF file, use $ORIGIN to refer to this location, e.g 
$ORIGIN/../lib/


Alex
--

Powered by www.kitware.com

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

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

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


Re: [CMake] Compatibility between cmake-based directives and autoconf-based directives

2013-02-05 Thread Alexander Neundorf
On Tuesday 05 February 2013, DRypl wrote:
 Is there a way how to avoid problems with different declarations of
 directives depending whether
 using autoconf (for a library) and cmake (for my application using that
 library). For example autoconf
 declares #define HAVE_UNISTD_H 1 while cmake declares #define
 HAVE_UNISTD_H.
 Using #cmakedefine01 instead of #cmakedefine does not solve the problem
 because statement
 #define HAVE_UNISTD_H 0 is apparently something else than #undef
 HAVE_UNISTD_H (and the
 library is using preprocessing checks as #ifdef HAVE_UNISTD_H). I also
 did not find solution in autoconf.


Try the following CMakeLists.txt:


cmake_minimum_required(VERSION 2.8)

set(HAVE_A TRUE)
set(HAVE_B TRUE)
set(HAVE_C FALSE)
set(HAVE_D FALSE)

configure_file(config.h.in config.h)


with the following config.h.in:
#cmakedefine HAVE_A 1
#cmakedefine HAVE_B
#cmakedefine HAVE_C 1
#cmakedefine HAVE_D

#cmakedefine01 HAVE_A
#cmakedefine01 HAVE_B
#cmakedefine01 HAVE_C
#cmakedefine01 HAVE_D

and look at the resulting config.h.

I think
#cmakedefine HAVE_FOO 1
is what you want.

Alex
--

Powered by www.kitware.com

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

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

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


Re: [CMake] When should I use add_subdirectory and when ExternalProject?

2013-02-05 Thread Jean-Christophe Fillion-Robin
Hi Alex,

You could probably pass the CMAKE_INSTALL_PREFIX option.
For example:
https://github.com/Slicer/Slicer/blob/master/SuperBuild/External_DCMTK.cmake#L44

Hth
Jc


On Tue, Feb 5, 2013 at 1:10 PM, Alexander Neundorf
a.neundorf-w...@gmx.netwrote:

 On Monday 04 February 2013, David Cole wrote:
  The OpenChemistry project (
 https://github.com/OpenChemistry/openchemistry
  ) is a very good example of a SuperBuild project that builds all of its
  external dependencies via ExternalProject, and then all of its git
  submodules (internal dependencies perhaps ?) also via ExternalProject.
 
  They use CMAKE_PREFIX_PATH both as a place to install all of the built
  components, and as a place for find_package to find stuff that was built
  by a previous ExternalProject_Add call.
 
  Study how they do stuff in their CMakeLists files and then get back to us
  here with more questions.

 one thing I had trouble with is related to the install step.

 With externalProject the install step happens at build time.
 If shared libraries are involved, the install destination should be the
 correct and final install destination, so that the RPATH of using projects
 will point to the correct location.
 This means that at build time I need to have the permissions to write to
 the
 final install destination (e.g. /opt/), i.e. typically root.

 Is this correct or am I missing something ?

 Alex
 --

 Powered by www.kitware.com

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

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

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




-- 
+1 919 869 8849
--

Powered by www.kitware.com

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

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

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

Re: [CMake] When should I use add_subdirectory and when ExternalProject?

2013-02-05 Thread David Cole

 

 

 

-Original Message-
From: Alexander Neundorf a.neundorf-w...@gmx.net
To: cmake cmake@cmake.org
Sent: Tue, Feb 5, 2013 1:09 pm
Subject: Re: [CMake] When should I use add_subdirectory and when 
ExternalProject?


On Monday 04 February 2013, David Cole wrote:
 The OpenChemistry project ( https://github.com/OpenChemistry/openchemistry
 ) is a very good example of a SuperBuild project that builds all of its
 external dependencies via ExternalProject, and then all of its git
 submodules (internal dependencies perhaps ?) also via ExternalProject.
 
 They use CMAKE_PREFIX_PATH both as a place to install all of the built
 components, and as a place for find_package to find stuff that was built
 by a previous ExternalProject_Add call.
 
 Study how they do stuff in their CMakeLists files and then get back to us
 here with more questions.

one thing I had trouble with is related to the install step.

With externalProject the install step happens at build time.
If shared libraries are involved, the install destination should be the 
correct and final install destination, so that the RPATH of using projects 
will point to the correct location.
This means that at build time I need to have the permissions to write to the 
final install destination (e.g. /opt/), i.e. typically root.

Is this correct or am I missing something ?

Alex
--

Powered by www.kitware.com

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

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

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




You are correct, but you are coming at it from a Linux-biased perspective.

For developers on the project, this technique works as-is, in the build tree,
and in the super-build's install tree, which is in a non-system, i.e., user 
writable
location. That's true on all platforms.

If you are building the openchemistry projects for packaging on a Linux box,
then you will use all the system packages, and not even build them as part
of the super build. Each one has a flag for whether or not to use the system one
or to build it.

For Mac and Windows installers, this technique works well, since all the built
pieces of the super build are bundled up together as relocatable app 
installations.

All that said, it's still evolving, and may need changes before becoming part of
any Linux distributions.


Cheers,
D


 
--

Powered by www.kitware.com

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

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

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

Re: [CMake] Compatibility between cmake-based directives and autoconf-based directives

2013-02-05 Thread DRypl
That's it. Thank you very much Alex :-)
D.



--
View this message in context: 
http://cmake.3232098.n2.nabble.com/Compatibility-between-cmake-based-directives-and-autoconf-based-directives-tp7583105p7583121.html
Sent from the CMake mailing list archive at Nabble.com.
--

Powered by www.kitware.com

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

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

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


Re: [CMake] When should I use add_subdirectory and when ExternalProject?

2013-02-05 Thread Alexander Neundorf
On Tuesday 05 February 2013, David Cole wrote:
 -Original Message-
 From: Alexander Neundorf a.neundorf-w...@gmx.net
 To: cmake cmake@cmake.org
 Sent: Tue, Feb 5, 2013 1:09 pm
 Subject: Re: [CMake] When should I use add_subdirectory and when
 ExternalProject?
 
 On Monday 04 February 2013, David Cole wrote:
  The OpenChemistry project (
  https://github.com/OpenChemistry/openchemistry ) is a very good example
  of a SuperBuild project that builds all of its external dependencies via
  ExternalProject, and then all of its git submodules (internal
  dependencies perhaps ?) also via ExternalProject.
  
  They use CMAKE_PREFIX_PATH both as a place to install all of the built
  components, and as a place for find_package to find stuff that was built
  by a previous ExternalProject_Add call.
  
  Study how they do stuff in their CMakeLists files and then get back to us
  here with more questions.
 
 one thing I had trouble with is related to the install step.
 
 With externalProject the install step happens at build time.
 If shared libraries are involved, the install destination should be the
 correct and final install destination, so that the RPATH of using projects
 will point to the correct location.
 This means that at build time I need to have the permissions to write to
 the final install destination (e.g. /opt/), i.e. typically root.
 
 Is this correct or am I missing something ?
 
 Alex
 --
 
 Powered by www.kitware.com
 
 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html
 
 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ
 
 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake
 
 
 
 
 You are correct, but you are coming at it from a Linux-biased perspective.
 
 For developers on the project, this technique works as-is, in the build
 tree, and in the super-build's install tree, which is in a non-system,
 i.e., user writable location. That's true on all platforms.
 
 If you are building the openchemistry projects for packaging on a Linux
 box, then you will use all the system packages, and not even build them
 as part of the super build. Each one has a flag for whether or not to use
 the system one or to build it.
 
 For Mac and Windows installers, this technique works well, since all the
 built pieces of the super build are bundled up together as relocatable app
 installations.

How do relative packages actually work on the Mac with install_name ?
Is this always relative ?
I mean, if I have an application and build it against a shared lib, and then 
later on at install time that shared lib is at some other place, the apps 
doesn't find, does it ?
 
Alex
--

Powered by www.kitware.com

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

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

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


Re: [CMake] Is INSTALL_RPATH Meant to be Relative to CMAKE_INSTALL_PREFIX?

2013-02-05 Thread David Narvaez
On Tue, Feb 5, 2013 at 1:15 PM, Alexander Neundorf
a.neundorf-w...@gmx.net wrote:
 I know this was the case at some point in I think the frameworks branch of
 kdelibs, but this was wrong, and I think it has been fixed.
 Or where did you see this ?

I'm currently using KDE 4.10 RC 2 and, as far as I understand (I'm not
a CMake expert), the situation is as follows:

1. LIB_INSTALL_DIR is set to lib
2. FindKDE4Internal.cmake is called
3. There's a call to _set_fancy(LIB_INSTALL_DIR ...) which would have
set the LIB_INSTALL_DIR path to an absolute path, but this variable
was already set so it is not overridden
4. There's another call to set(INSTALL_RPATH ${LIB_INSTALL_DIR})
which, at that point, is relative
5. Library's RPATH eventually contains a relative path

 The install rpath must be an absolute path, or if you want it to be
 relative
 to the location of the ELF file, use $ORIGIN to refer to this location,
 e.g
 $ORIGIN/../lib/

I see, so what would you recommend from the workflow above? Set
LIB_INSTALL_DIR to a prefixed path? Add checks in
FindKDE4Internal.cmake before setting  INSTALL_RPATH?

Thanks for your answer.

David E. Narváez
--

Powered by www.kitware.com

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

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

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


Re: [CMake] When should I use add_subdirectory and when ExternalProject?

2013-02-05 Thread David Cole

 

 

 

-Original Message-
From: Alexander Neundorf a.neundorf-w...@gmx.net
To: David Cole dlrd...@aol.com
Cc: cmake cmake@cmake.org
Sent: Tue, Feb 5, 2013 2:50 pm
Subject: Re: [CMake] When should I use add_subdirectory and when 
ExternalProject?


On Tuesday 05 February 2013, David Cole wrote:
 -Original Message-
 From: Alexander Neundorf a.neundorf-w...@gmx.net
 To: cmake cmake@cmake.org
 Sent: Tue, Feb 5, 2013 1:09 pm
 Subject: Re: [CMake] When should I use add_subdirectory and when
 ExternalProject?
 
 On Monday 04 February 2013, David Cole wrote:
  The OpenChemistry project (
  https://github.com/OpenChemistry/openchemistry ) is a very good example
  of a SuperBuild project that builds all of its external dependencies via
  ExternalProject, and then all of its git submodules (internal
  dependencies perhaps ?) also via ExternalProject.
  
  They use CMAKE_PREFIX_PATH both as a place to install all of the built
  components, and as a place for find_package to find stuff that was built
  by a previous ExternalProject_Add call.
  
  Study how they do stuff in their CMakeLists files and then get back to us
  here with more questions.
 
 one thing I had trouble with is related to the install step.
 
 With externalProject the install step happens at build time.
 If shared libraries are involved, the install destination should be the
 correct and final install destination, so that the RPATH of using projects
 will point to the correct location.
 This means that at build time I need to have the permissions to write to
 the final install destination (e.g. /opt/), i.e. typically root.
 
 Is this correct or am I missing something ?
 
 Alex
 --
 
 Powered by www.kitware.com
 
 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html
 
 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ
 
 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake
 
 
 
 
 You are correct, but you are coming at it from a Linux-biased perspective.
 
 For developers on the project, this technique works as-is, in the build
 tree, and in the super-build's install tree, which is in a non-system,
 i.e., user writable location. That's true on all platforms.
 
 If you are building the openchemistry projects for packaging on a Linux
 box, then you will use all the system packages, and not even build them
 as part of the super build. Each one has a flag for whether or not to use
 the system one or to build it.
 
 For Mac and Windows installers, this technique works well, since all the
 built pieces of the super build are bundled up together as relocatable app
 installations.

How do relative packages actually work on the Mac with install_name ?
Is this always relative ?
I mean, if I have an application and build it against a shared lib, and then 
later on at install time that shared lib is at some other place, the apps 
doesn't find, does it ?
 
Alex



via BundleUtilities and fixup_bundle. Using @executable_path in bundled shared 
libraries...

At install time, that lib is going to be inside the app bundle. It is not going 
to be at some other place.


 
--

Powered by www.kitware.com

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

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

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

Re: [CMake] Is INSTALL_RPATH Meant to be Relative to CMAKE_INSTALL_PREFIX?

2013-02-05 Thread Alexander Neundorf
On Tuesday 05 February 2013, David Narvaez wrote:
 On Tue, Feb 5, 2013 at 1:15 PM, Alexander Neundorf
 
 a.neundorf-w...@gmx.net wrote:
  I know this was the case at some point in I think the frameworks branch
  of kdelibs, but this was wrong, and I think it has been fixed.
  Or where did you see this ?
 
 I'm currently using KDE 4.10 RC 2 and, as far as I understand (I'm not
 a CMake expert), the situation is as follows:
 
 1. LIB_INSTALL_DIR is set to lib
 2. FindKDE4Internal.cmake is called
 3. There's a call to _set_fancy(LIB_INSTALL_DIR ...) which would have
 set the LIB_INSTALL_DIR path to an absolute path, but this variable
 was already set so it is not overridden
 4. There's another call to set(INSTALL_RPATH ${LIB_INSTALL_DIR})
 which, at that point, is relative
 5. Library's RPATH eventually contains a relative path
 
  The install rpath must be an absolute path, or if you want it to be
  relative
  to the location of the ELF file, use $ORIGIN to refer to this location,
  e.g
  $ORIGIN/../lib/
 
 I see, so what would you recommend from the workflow above? Set
 LIB_INSTALL_DIR to a prefixed path? Add checks in
 FindKDE4Internal.cmake before setting  INSTALL_RPATH?

I just checked.
FindKDE4Internal.cmake in the KDE/4.10 branch has the following code:

...
if (WIN32)
...
else(WIN32)
...
   _set_fancy(LIB_INSTALL_DIR  ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} ...)
...


So when building kdelibs, you should get an absolute LIB_INSTALL_DIR.
When installing kdelibs then, it will again make sure that LIB_INSTALL_DIR is 
absolute.

What exactly are you building ?
Is LIB_INSTALL_DIR preset somewhere ?

Alex
--

Powered by www.kitware.com

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

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

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


Re: [CMake] Is INSTALL_RPATH Meant to be Relative to CMAKE_INSTALL_PREFIX?

2013-02-05 Thread David Narvaez
On Tue, Feb 5, 2013 at 3:29 PM, Alexander Neundorf
a.neundorf-w...@gmx.net wrote:
 What exactly are you building ?
 Is LIB_INSTALL_DIR preset somewhere ?

The software in question is GammaRay, see

https://github.com/KDAB/GammaRay/blob/master/CMakeLists.txt#L124

where it sets the LIB_INSTALL_DIR variable (thus avoiding the
_set_fancy part, I think), and the issue reported here

https://github.com/KDAB/GammaRay/issues/36

Thanks again for your support.

David E. Narvaez
--

Powered by www.kitware.com

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

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

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


Re: [CMake] Is INSTALL_RPATH Meant to be Relative to CMAKE_INSTALL_PREFIX?

2013-02-05 Thread Alexander Neundorf
On Tuesday 05 February 2013, David Narvaez wrote:
 On Tue, Feb 5, 2013 at 3:29 PM, Alexander Neundorf
 
 a.neundorf-w...@gmx.net wrote:
  What exactly are you building ?
  Is LIB_INSTALL_DIR preset somewhere ?
 
 The software in question is GammaRay, see
 
 https://github.com/KDAB/GammaRay/blob/master/CMakeLists.txt#L124
 
 where it sets the LIB_INSTALL_DIR variable (thus avoiding the
 _set_fancy part, I think), and the issue reported here
 
 https://github.com/KDAB/GammaRay/issues/36

Does GammaRay use KDE ?
Ah, I see, e.g. kjobtracker.
So it uses FindKDE4Internal.cmake, then LIB_INSTALL_DIR should not be set like 
this, because it leads to such bad RPATHs, as you see it.

So either LIB_INSTALL_DIR should be set absolute, or unset() before 
find_package(KDE4).

To make it work for you, set it to 
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})

Alex
--

Powered by www.kitware.com

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

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

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


[CMake] Linker command line length issues when cross-compiling from Windows-Linux

2013-02-05 Thread Eric Gross
Hi,

I'm using CMake 2.8.10.2 with the Unix Makefiles generator on Windows 
and cross-compiling for Linux using GCC. I have Cygwin in the path for 
make/sh/etc.

To cross compile I have the following items set:
CMAKE_SYSTEM_NAME:STRING=Linux
CMAKE_CXX_COMPILER:STRING=path to cross-compiler gcc
CMAKE_C_COMPILER:STRING=path to cross-compiler gcc

This process works perfectly with the exception of some larger components 
that have a few hundred object files to link in. When linking those larger 
components I get an error about unterminated quotes from sh.exe. By 
cutting down the number of objects I have deduced that I am reaching the 
command line length limits of Cygwin's sh.exe (or possibly OS limits).

It appears that the generated Makefiles are passing all the objects on the 
command line rather than using a response file. Googling the CMake email 
lists seems to indicate that on Windows this is worked around already in 
the platform-specific files used by CMake and it uses a response file 
there. I'm guessing that code is not being used here for me because I am 
cross-compiling. Is this correct? Is there any way to force it to use that 
same mechanism?

I thought about trying the MinGW Makefiles generator which appears to 
use cmd.exe, but it does not allow Cygwin's sh.exe to be in the path and 
our larger build system that calls into CMake requires it. I'm also not 
clear if it would expect to use the MinGW version of GCC rather than the 
cross-compiler GCC.

Any ideas?

Thanks,
Eric--

Powered by www.kitware.com

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

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

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

[Cmake-commits] CMake branch, master, updated. v2.8.10.2-562-g252209f

2013-02-05 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  252209fb0bce4adba20f1aa3971437d336e5d2b0 (commit)
   via  19f3208a0662113acbbb42178bf83a1f7ce73cac (commit)
  from  f77a1147f5dc2844437c891ea880c3b754fe9978 (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=252209fb0bce4adba20f1aa3971437d336e5d2b0
commit 252209fb0bce4adba20f1aa3971437d336e5d2b0
Merge: f77a114 19f3208
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:45:52 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:45:52 2013 -0500

Merge topic 'avoid-CTestLimitDashJ-crash-on-Borland'

19f3208 Tests: Avoid CTestLimitDashJ crash on Borland 5.8 builds


---

Summary of changes:
 Tests/CMakeLists.txt |1 +
 1 files changed, 1 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.10.2-564-g4341fd2

2013-02-05 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  4341fd2579d78e72eea8bd9b87a21fa660d69a35 (commit)
   via  9397270d73dc239cde41ddaa9a3f05a75a2cd873 (commit)
  from  252209fb0bce4adba20f1aa3971437d336e5d2b0 (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=4341fd2579d78e72eea8bd9b87a21fa660d69a35
commit 4341fd2579d78e72eea8bd9b87a21fa660d69a35
Merge: 252209f 9397270
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:45:57 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:45:57 2013 -0500

Merge topic 'new-command-class-type-macros'

9397270 Fix use of cmTypeMacro in new command classes


---

Summary of changes:
 Source/cmTargetCompileDefinitionsCommand.h |2 +-
 Source/cmTargetIncludeDirectoriesCommand.h |2 +-
 Source/cmTargetPropCommandBase.h   |1 +
 3 files changed, 3 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. v2.8.10.2-569-g08f6932

2013-02-05 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  08f69324bb440ea873d78e271a3f360b9c558af7 (commit)
   via  fd2a0d58c5d0aa0529d4ac65cc899f6d1109fb15 (commit)
  from  50de1247a0aed5eab03fbedd76a79cc9694794e1 (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=08f69324bb440ea873d78e271a3f360b9c558af7
commit 08f69324bb440ea873d78e271a3f360b9c558af7
Merge: 50de124 fd2a0d5
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:20 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:20 2013 -0500

Merge topic 'wince-cmake-variable'

fd2a0d5 Set WINCE to 1 when building for WindowsCE


---

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |5 +++--
 1 files changed, 3 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. v2.8.10.2-571-gd1660f0

2013-02-05 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  d1660f089585ef2e28d918f87d1e6065a444bb2c (commit)
   via  b6f66542674cac75821dfb10677bf52318afcda5 (commit)
  from  08f69324bb440ea873d78e271a3f360b9c558af7 (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=d1660f089585ef2e28d918f87d1e6065a444bb2c
commit d1660f089585ef2e28d918f87d1e6065a444bb2c
Merge: 08f6932 b6f6654
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:23 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:23 2013 -0500

Merge topic 'fix-include-directories-unix-path'

b6f6654 Use the result of converting to a unix path.


---

Summary of changes:
 Source/cmTarget.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, master, updated. v2.8.10.2-573-g9ff34ff

2013-02-05 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  9ff34ff2fddc4c60737c16b9ace7fd567047da9c (commit)
   via  59b568e5e8e294345c10789e1b3488391d5cd6f3 (commit)
  from  d1660f089585ef2e28d918f87d1e6065a444bb2c (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=9ff34ff2fddc4c60737c16b9ace7fd567047da9c
commit 9ff34ff2fddc4c60737c16b9ace7fd567047da9c
Merge: d1660f0 59b568e
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:27 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:27 2013 -0500

Merge topic 'fix-atomic-rename-on-Windows'

59b568e Fix cmSystemTools::RenameFile race on Windows


---

Summary of changes:
 Source/cmSystemTools.cxx |   53 ++---
 1 files changed, 21 insertions(+), 32 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.10.2-575-ge6b72e8

2013-02-05 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  e6b72e8b8719f5cd8b7bd8b296c05123c0fb1395 (commit)
   via  0f24a667152c86982f7296b7df19f058c660d981 (commit)
  from  9ff34ff2fddc4c60737c16b9ace7fd567047da9c (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=e6b72e8b8719f5cd8b7bd8b296c05123c0fb1395
commit e6b72e8b8719f5cd8b7bd8b296c05123c0fb1395
Merge: 9ff34ff 0f24a66
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:32 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:32 2013 -0500

Merge topic 'vs6-rule-files'

0f24a66 VS 6: Create .rule file directory before file


---

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |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.10.2-577-g252c521

2013-02-05 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  252c5211b57e48da87b94a49503f515ef5edbe6f (commit)
   via  a55d5ca48179d3be4d8406028c0992d45ada8882 (commit)
  from  e6b72e8b8719f5cd8b7bd8b296c05123c0fb1395 (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=252c5211b57e48da87b94a49503f515ef5edbe6f
commit 252c5211b57e48da87b94a49503f515ef5edbe6f
Merge: e6b72e8 a55d5ca
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:36 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:36 2013 -0500

Merge topic 'ninja-link-rsp-newlines'

a55d5ca Ninja: Avoid LNK1170 linker error


---

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


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


[Cmake-commits] CMake branch, master, updated. v2.8.10.2-595-g0205258

2013-02-05 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  020525845a3999078e4f7897d293c5aeab20af87 (commit)
   via  5484c6069409331a8054190d9bae874d5b3c3bff (commit)
   via  1fd8d017e6b548520b7f2aa8dcc6ce39a2ec3137 (commit)
   via  a6d3ffcb1fa71395cb0d865b3c79450280554651 (commit)
   via  aed590a7e0c135f2466fb19cfe09674c687432ab (commit)
   via  06e8dedb3c1412625b146b214cb542f0577c923c (commit)
   via  e2e0d2e3c7108d5ce41f032ad9089155c6b4735c (commit)
   via  ee2abfdc8913e4e9a5bc77c56a9d3dea83fde6f1 (commit)
   via  aa8b2288d320335d28f3777e1bc86ed3df231a09 (commit)
   via  9e518a8169bae33c8a971c146e29b5af20114648 (commit)
   via  175ed02207ea5fe25aa7156acb2554d706611263 (commit)
   via  4befecc77caa97aeb450d9a2b6bcbe0985dc4054 (commit)
   via  bcd25808ac540d279a36a9e0f1b60f152fc0d6bb (commit)
   via  c0cebcb19ae53773f6b21035813c6d58dd829b94 (commit)
   via  52759930bd7a5e1642b16cdc2bde3d23aaaddd2c (commit)
   via  7bb8344d50fa317580068dedd00b019be8a6cb98 (commit)
   via  00d801fbfe9c5170e3a83019cc2e3f6b1ce64200 (commit)
   via  ab26249db107146fc9ad624ac9dddc4052e798d6 (commit)
  from  252c5211b57e48da87b94a49503f515ef5edbe6f (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=020525845a3999078e4f7897d293c5aeab20af87
commit 020525845a3999078e4f7897d293c5aeab20af87
Merge: 252c521 5484c60
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:40 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:40 2013 -0500

Merge topic 'add-ExternalData-module'

5484c60 Merge branch 'vs6-rule-files' into add-ExternalData-module
1fd8d01 ExternalData: Attach download rules to content links in IDEs
a6d3ffc Fix Module.ExternalData test on VS 6
aed590a Fix Module.ExternalData test on Cygwin
06e8ded Merge branch 'fix-atomic-rename-on-Windows' into 
add-ExternalData-module
e2e0d2e ExternalData: Collapse ../ components in DATA{} paths
ee2abfd ExternalData: Add support for SHA 1 and 2 hash algorithms
aa8b228 ExternalData: Generalize hash algo/ext handling
9e518a8 ExternalData: Allow DATA{} syntax to reference directories
175ed02 ExternalData: Allow ()-groups in series match regex
4befecc ExternalData: Add tests covering interfaces and errors
bcd2580 ExternalData: Improve series matching using an explicit syntax
c0cebcb ExternalData: Remove unused private interface
5275993 ExternalData: Cleanup stray TODO and typo in comments
7bb8344 ExternalData: Do not match directory names when resolving DATA{}
00d801f ExternalData: Remove compatibility with CMake  2.8.5
...


---

Summary of changes:
 Modules/ExternalData.cmake |  761 
 Modules/ExternalData_config.cmake.in   |4 +
 Tests/CMakeLists.txt   |   13 +
 Tests/Module/ExternalData/CMakeLists.txt   |   38 +
 Tests/Module/ExternalData/Data.dat.md5 |1 +
 Tests/Module/ExternalData/Data1Check.cmake |   52 ++
 Tests/Module/ExternalData/Data2.dat.md5|1 +
 Tests/Module/ExternalData/Data2/CMakeLists.txt |   11 +
 Tests/Module/ExternalData/Data2/Data2Check.cmake   |   12 +
 .../ExternalData/Data2/SeriesC_1_.my.dat.md5   |1 +
 .../ExternalData/Data2/SeriesC_2_.my.dat.md5   |1 +
 .../ExternalData/Data2/SeriesC_3_.my.dat.md5   |1 +
 Tests/Module/ExternalData/Data2b.dat.md5   |1 +
 Tests/Module/ExternalData/Data3/CMakeLists.txt |   14 +
 Tests/Module/ExternalData/Data3/Data.dat.md5   |1 +
 Tests/Module/ExternalData/Data3/Data3Check.cmake   |   25 +
 Tests/Module/ExternalData/Data3/Other.dat.md5  |1 +
 Tests/Module/ExternalData/Directory/A.dat.md5  |1 +
 Tests/Module/ExternalData/Directory/B.dat.md5  |1 +
 Tests/Module/ExternalData/Directory/C.dat.md5  |1 +
 Tests/Module/ExternalData/MD5/.gitattributes   |1 +
 .../MD5/08cfcf221f76ace7b906b312284e73d7   |1 +
 .../MD5/30ba0acdee9096b3b9fc6c69362c6b42   |1 +
 .../MD5/31eff09e84fca01415f8cd9d82ec432b   |1 +
 .../MD5/401767f22a456b3522953722090a2c36   |1 +
 .../MD5/8c018830e3efa5caf3c7415028335a57   |1 +
 .../MD5/8f4add4581551facf27237e6577fd662   |1 +
 .../MD5/9d980b06c2f0fec3d4872d68175b9822   |1 +
 .../MD5/aaad162b85f60d1eb57ca71a23e8efd7   |1 +
 

[Cmake-commits] CMake branch, master, updated. v2.8.10.2-608-gec85306

2013-02-05 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  ec85306025ae787e08d4ce097fde966f1809c74f (commit)
   via  e48d84209cde93b43fcfb305897b4f52cd18a55f (commit)
   via  089fe1c13d8fa73be5182162a855c17351d1f918 (commit)
   via  179f49560286e2e322b9b0cf5d0a277b7634540f (commit)
   via  e7b579bd01690f27c82ee9cbda4b7023f4a3d6c9 (commit)
   via  77cecb778ff1882d87401c1055ec06585462f787 (commit)
   via  0b92602b816e2584db3781b120a1e5200da72ada (commit)
   via  0fa7f69c0e2cdcd8b7ece400651ee7821b2ede4b (commit)
   via  2c3654c3de718fe822f8960063373774fc019494 (commit)
   via  d4297d5697cd10114f8accb7a233aa1f5ebc50ab (commit)
   via  df4d2b28b24a3172daf1290070199633f7c46cf0 (commit)
   via  7ceeba992b4fb35ca05760b3170e68f41dfc1bb5 (commit)
   via  30268b46f8237f25c82858693c000f5da8ede6ad (commit)
  from  020525845a3999078e4f7897d293c5aeab20af87 (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=ec85306025ae787e08d4ce097fde966f1809c74f
commit ec85306025ae787e08d4ce097fde966f1809c74f
Merge: 0205258 e48d842
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:46:43 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 14:46:43 2013 -0500

Merge topic 'tll-includes-defines'

e48d842 Cache context-independent includes on evaluation.
089fe1c Optimize genex evaluation for includes and defines.
179f495 find_package: Reword package_NO_INTERFACES documentation
e7b579b Test workaround of bad interface include directories from depends.
77cecb7 Add includes and compile definitions with target_link_libraries.
0b92602 Add the $LINKED:... generator expression.
0fa7f69 Add API to check if we're reading a includes or defines property.
2c3654c Add a way to exclude INTERFACE properties from exported targets.
d4297d5 Export targets to a targets file, not a Config file.
df4d2b2 Make it an error for INSTALL_PREFIX to be evaluated.
7ceeba9 Advance more when preprocessing exported strings.
30268b4 Handle reading empty properties defined by the link interface.


---

Summary of changes:
 Source/cmDocumentGeneratorExpressions.h|8 ++
 Source/cmExportFileGenerator.cxx   |   75 ++--
 Source/cmExportFileGenerator.h |4 +-
 Source/cmFindPackageCommand.cxx|   20 +++
 Source/cmGeneratorExpression.cxx   |8 +-
 Source/cmGeneratorExpression.h |5 +
 Source/cmGeneratorExpressionDAGChecker.cxx |   42 +++
 Source/cmGeneratorExpressionDAGChecker.h   |6 +-
 Source/cmGeneratorExpressionEvaluator.cxx  |  127 +++-
 Source/cmGeneratorExpressionEvaluator.h|1 +
 Source/cmTarget.cxx|   41 +--
 Source/cmTarget.h  |6 +-
 Source/cmTargetLinkLibrariesCommand.cxx|   53 
 Source/cmTargetLinkLibrariesCommand.h  |9 ++
 .../target_compile_definitions/CMakeLists.txt  |6 +
 .../target_compile_definitions/consumer.cpp|4 +
 .../target_include_directories/CMakeLists.txt  |   11 ++-
 .../target_include_directories/consumer.cpp|5 +
 .../target_link_libraries/CMakeLists.txt   |   25 -
 Tests/CMakeCommands/target_link_libraries/depG.cpp |7 +
 Tests/CMakeCommands/target_link_libraries/depG.h   |7 +
 .../target_link_libraries/targetC.cpp  |   16 +++
 Tests/CompatibleInterface/CMakeLists.txt   |   14 ++-
 Tests/ExportImport/Export/CMakeLists.txt   |   41 ---
 Tests/ExportImport/Import/A/CMakeLists.txt |   18 +---
 Tests/ExportImport/Import/CMakeLists.txt   |5 +
 .../Import/package_new_new/CMakeLists.txt  |   23 
 .../Import/package_new_old/CMakeLists.txt  |   24 
 .../Import/package_old_old/CMakeLists.txt  |   24 
 Tests/GeneratorExpression/CMakeLists.txt   |1 -
 Tests/GeneratorExpression/check-part2.cmake|1 -
 .../TargetIncludeDirectories/CMakeLists.txt|   41 +++
 Tests/Qt4Targets/CMakeLists.txt|   19 ---
 .../BadInstallPrefix-result.txt}   |0
 .../BadInstallPrefix-stderr.txt|9 ++
 ...{BadTargetName.cmake = BadInstallPrefix.cmake} |2 +-
 .../GeneratorExpression/RunCMakeTest.cmake |1 +
 .../BadLinked-result.txt}  

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1928-g7856989

2013-02-05 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  7856989a47c051df97094010438308beec1762ec (commit)
   via  ec85306025ae787e08d4ce097fde966f1809c74f (commit)
   via  020525845a3999078e4f7897d293c5aeab20af87 (commit)
   via  252c5211b57e48da87b94a49503f515ef5edbe6f (commit)
   via  e6b72e8b8719f5cd8b7bd8b296c05123c0fb1395 (commit)
   via  9ff34ff2fddc4c60737c16b9ace7fd567047da9c (commit)
   via  d1660f089585ef2e28d918f87d1e6065a444bb2c (commit)
   via  08f69324bb440ea873d78e271a3f360b9c558af7 (commit)
   via  50de1247a0aed5eab03fbedd76a79cc9694794e1 (commit)
   via  4341fd2579d78e72eea8bd9b87a21fa660d69a35 (commit)
   via  252209fb0bce4adba20f1aa3971437d336e5d2b0 (commit)
   via  f77a1147f5dc2844437c891ea880c3b754fe9978 (commit)
   via  8669f64d54f2cd8d6d796487b5a5a9312a76a750 (commit)
   via  a25f26f54ffda4d115bf1768b3469086e10ecb48 (commit)
   via  425c56788d30d85429f7d068c1d340dee99456a6 (commit)
  from  e64384aef351ebe552f842bc7e198bb06391e073 (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=7856989a47c051df97094010438308beec1762ec
commit 7856989a47c051df97094010438308beec1762ec
Merge: e64384a ec85306
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 14:47:18 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Feb 5 14:47:18 2013 -0500

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.10.2-1942-ga0c8456

2013-02-05 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  a0c84560458844f92855dfa82d9f9b6f0854a640 (commit)
   via  a0ac40fc58398e55fc89a148b58f0dc5c54d3242 (commit)
  from  362b11c827c642858895b6e903bf9f1fc64a9435 (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=a0c84560458844f92855dfa82d9f9b6f0854a640
commit a0c84560458844f92855dfa82d9f9b6f0854a640
Merge: 362b11c a0ac40f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 18:54:05 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 18:54:05 2013 -0500

Merge topic 'generator-toolset' into next

a0ac40f Fix RunCMake.GeneratorToolset test on Xcode  3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0ac40fc58398e55fc89a148b58f0dc5c54d3242
commit a0ac40fc58398e55fc89a148b58f0dc5c54d3242
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 18:52:08 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Feb 5 18:52:40 2013 -0500

Fix RunCMake.GeneratorToolset test on Xcode  3

The Xcode generator does not support a generator toolset on Xcode
versions before 3.  Teach the test to cover the behavior expected for
the available version of Xcode.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e71672e..320ebcc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -42,10 +42,15 @@ macro(add_RunCMake_test test)
 -DRunCMake_GENERATOR_TOOLSET=${CMAKE_TEST_GENERATOR_TOOLSET}
 -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
 -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+${${test}_ARGS}
 -P ${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake
 )
 endmacro()
 
+if(XCODE_VERSION AND ${XCODE_VERSION} VERSION_LESS 3)
+  set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1)
+endif()
+
 add_RunCMake_test(CMP0019)
 add_RunCMake_test(ExternalData)
 add_RunCMake_test(GeneratorExpression)
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake 
b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
index 400d0a8..09375d9 100644
--- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
@@ -3,7 +3,7 @@ include(RunCMake)
 set(RunCMake_GENERATOR_TOOLSET )
 run_cmake(NoToolset)
 
-if(${RunCMake_GENERATOR} MATCHES Visual Studio 1[01]|Xcode)
+if(${RunCMake_GENERATOR} MATCHES Visual Studio 1[01]|Xcode AND NOT 
XCODE_BELOW_3)
   set(RunCMake_GENERATOR_TOOLSET Test Toolset)
   run_cmake(TestToolset)
 else()

---

Summary of changes:
 Tests/RunCMake/CMakeLists.txt  |5 +
 Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake |2 +-
 2 files changed, 6 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.10.2-1944-ga4f81d9

2013-02-05 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  a4f81d981e281636ac708bd6bd599a40c01a31d4 (commit)
   via  14252c08d04cff729ad6253e69d24bd6d4d8c63d (commit)
  from  a0c84560458844f92855dfa82d9f9b6f0854a640 (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=a4f81d981e281636ac708bd6bd599a40c01a31d4
commit a4f81d981e281636ac708bd6bd599a40c01a31d4
Merge: a0c8456 14252c0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 19:48:33 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 5 19:48:33 2013 -0500

Merge topic 'generator-toolset' into next

14252c0 Use generator toolset error message with predictable whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14252c08d04cff729ad6253e69d24bd6d4d8c63d
commit 14252c08d04cff729ad6253e69d24bd6d4d8c63d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 5 19:44:55 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Feb 5 19:44:55 2013 -0500

Use generator toolset error message with predictable whitespace

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 97c4965..ba29589 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -82,9 +82,12 @@ cmGlobalGenerator::~cmGlobalGenerator()
 bool cmGlobalGenerator::SetGeneratorToolset(std::string const ts)
 {
   cmOStringStream e;
-  e  this-GetName() 
- generator does not support toolset specification, but 
-toolset \  ts  \ was specified.;
+  e 
+Generator\n
+this-GetName()  \n
+does not support toolset specification, but toolset\n
+ts  \n
+was specified.;
   this-CMakeInstance-IssueMessage(cmake::FATAL_ERROR, e.str(),
 cmListFileBacktrace());
   return false;
diff --git a/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt 
b/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
index 0c9e301..6150fef 100644
--- a/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
+++ b/Tests/RunCMake/GeneratorToolset/BadToolset-stderr.txt
@@ -1,3 +1,10 @@
 CMake Error:
-  [A-Za-z0-9 -]+ generator does not support toolset specification, but
-  toolset Bad Toolset was specified.$
+  Generator
+
+[A-Za-z0-9 -]+
+
+  does not support toolset specification, but toolset
+
+Bad Toolset
+
+  was specified.$

---

Summary of changes:
 Source/cmGlobalGenerator.cxx   |9 ++---
 .../GeneratorToolset/BadToolset-stderr.txt |   11 +--
 2 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.10.2-609-g47eacab

2013-02-05 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  47eacab06da33230fb06c9075a287d465aa237c4 (commit)
  from  ec85306025ae787e08d4ce097fde966f1809c74f (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=47eacab06da33230fb06c9075a287d465aa237c4
commit 47eacab06da33230fb06c9075a287d465aa237c4
Author: Kitware Robot kwro...@kitware.com
AuthorDate: Wed Feb 6 00:01:19 2013 -0500
Commit: Kitware Robot kwro...@kitware.com
CommitDate: Wed Feb 6 00:01:19 2013 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8a54237..10d7634 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 10)
-set(CMake_VERSION_TWEAK 20130205)
+set(CMake_VERSION_TWEAK 20130206)
 #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