[cmake-developers] [patch] Qt plugins are missing when deploying

2014-07-24 Thread Mathieu MARACHE 
I added two plugins qnativewifi and qtga that where missing in
FindQt4.cmake and thus where not deployed with DeployQt4.cmake although
they were mentioned in the plugins parameters.

This is a patch is against current master but could well be back ported to
earlier versions since this file has slightly changed

thanks
--
nǝıɥʇɐƜ


0001-Added-nativewifi-and-qtga-plugins.patch
Description: Binary data
-- 

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/mailman/listinfo/cmake-developers

[cmake-developers] [CMake 0015036]: make --question always returns 1

2014-07-24 Thread Mantis Bug Tracker 

The following issue has been SUBMITTED. 
== 
http://www.cmake.org/Bug/view.php?id=15036 
== 
Reported By:Simon Ask Ulsnes
Assigned To:
== 
Project:CMake
Issue ID:   15036
Category:   (No Category)
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2014-07-24 05:48 EDT
Last Modified:  2014-07-24 05:48 EDT
== 
Summary:make --question always returns 1
Description: 
In my project, I'm relying on the build system being able to answer the question
whether or not the source tree has been updated or not. Currently, Makefiles
generated by CMake do not support this usage for one reason or another.

The exit code of make --question should be 0 if all targets (or the specified
target) are up to date, and nonzero if changes have been made. However,
CMake-generated Makefiles always indicate that changes have been made, which
results in nontrivial work being executed unnecessarily.

Steps to Reproduce: 
1. Create simple project with a single source file and a CMakeLists.txt
2. Create the Makefile with `cmake .`
3. Run `make`.
4. Run `make --question`.
5. Observe that the exit code is 1 instead of 0, even though the source file was
not updated between steps 3 and 4.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2014-07-24 05:48 Simon Ask UlsnesNew Issue
==

-- 

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/mailman/listinfo/cmake-developers

[cmake-developers] [CMake 0015037]: given a cpp file, how to know what target it's built and where is the flags.make is placed

2014-07-24 Thread Mantis Bug Tracker 

The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=15037 
== 
Reported By:chen bin
Assigned To:
== 
Project:CMake
Issue ID:   15037
Category:   CMake
Reproducibility:always
Severity:   major
Priority:   immediate
Status: new
== 
Date Submitted: 2014-07-24 09:11 EDT
Last Modified:  2014-07-24 09:11 EDT
== 
Summary:given a cpp file, how to know what target it's built
and where is the flags.make is placed
Description: 
assume the generator is GNU make. how to know what executable or library is
built from the build directory *by my software*?

the executable or library is built through the rule add_executable or
add_library
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2014-07-24 09:11 chen bin   New Issue
==

-- 

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/mailman/listinfo/cmake-developers

Re: [cmake-developers] CMake generates Makefiles that don't parallelize as much as they could.

2014-07-24 Thread Nick Overdijk 
I'm using target_include_directories of A to get some include directories
into B well, so I can't use target_link_libraries(A INTERFACE B), and I
can't seem to use the OBJECT-way neither since B's sources won't compile
without A's INTERFACE_INCLUDE_DIRECTORIES... Any suggestions?


On Wed, Jul 23, 2014 at 3:19 PM, Nick Overdijk n...@astrant.net wrote:

 Crystal clear. Another layer of indirection eh? I'll see if I can work
 with that... Thanks for the explanation.


 On Wed, Jul 23, 2014 at 3:14 PM, Brad King brad.k...@kitware.com wrote:

 On 07/23/2014 09:07 AM, Nick Overdijk wrote:
  Oh wait, since a is in the interface of b, b will always be
  accompanied by a, even though it's not a dependency.
  Is that how it works?

 Yes.  If B is a static library then it does not really link so
 its dependencies are only ever used transitively when something
 else links to B.  If B really links as a shared library though
 then see the following.

 If target B links to target A then CMake will not compile objects
 in B until A is done.  As explained in my previous link this is
 because we allow A to contain custom commands that generate
 headers used by B.  The VS and Xcode IDE build systems offer only
 this granularity since they organize compilation and linking rules
 of a single target together.  The Makefile generator was designed
 this way too.  Only the Ninja generator has a chance of increasing
 parallelism if the extra ordering dependencies were dropped.  We've
 thought about how to do extra analysis to determine when there is
 no such custom command to drop them but have not implemented anything
 yet.

 You might be able to use OBJECT libraries to increase parallelism
 for all generators and with no changes to CMake:

  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
  add_library(Aobjs OBJECT a1.c a2.c)
  add_library(Bobjs OBJECT b1.c b2.c)
  add_library(Cobjs OBJECT c1.c c2.c)
  set(dummy_c dummy.c) # needed for VS 6 and Xcode
  add_library(A SHARED $TARGET_OBJECTS:Aobjs ${dummy_c})
  add_library(B SHARED $TARGET_OBJECTS:Bobjs ${dummy_c})
  add_library(C SHARED $TARGET_OBJECTS:Cobjs ${dummy_c})
  target_link_libraries(B PUBLIC A)
  target_link_libraries(C PUBLIC B)

 This way the object compilations will be completely independent
 of one another and of the linking and ordering dependencies.

 -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/mailman/listinfo/cmake-developers

Re: [CMake] Controlling the targets in an export set

2014-07-24 Thread Nils Gladitz 

On 07/24/2014 01:57 AM, Adar Dembo wrote:

I have a project that generates a shared library foo. As part of the
build, the bar1, bar2, and bar3 static archives are created, and
eventually, foo is linked against all of them. Thus, the project's sole
deliverable is libfoo.so; all the necessary symbols from the bar1..bar3
archives are found within libfoo.so.

If I try to export foo using install(TARGETS foo EXPORT foo ...) and
install(EXPORT foo ...), cmake complains that target foo requires
targets bar1, bar2, and bar3, which are not in the export set. I have to
add install(TARGETS bar1 EXPORT foo ...) for bar1..bar3 if I want this
to succeed. However, this also means that I'm exporting my static
archives, which as I wrote earlier aren't necessary.

How can I exercise finer-grained control over foo's export set? How can
I build an export set containing foo but excluding bar1, bar2, and bar3?


You can link your static libraries to your shared library privately 
hence removing them from foo's interface:


  target_link_libraries(foo PRIVATE bar1 bar2 bar3)

You are probably already aware but just in case ...

To portably link archives to shared libraries you need position 
independent code[1].


Of the objects contained in your archives only those will get included 
which are required to resolve some reference when creating libfoo.so.
Symbols that were contained in objects which were not required in the 
link will hence not be available.


This might seemed to have worked within the project until now given that 
the archives were in your link interface.


Nils

[1] http://cmake.org/cmake/help/v3.0/prop_tgt/POSITION_INDEPENDENT_CODE.html
--

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/mailman/listinfo/cmake

[CMake] How to get rid of AUTOMOC: Checking ... messages

2014-07-24 Thread Dominique Ledit 
Hi

I currently use 2.8.12.2 CMake version and Qt 4.7.3 and set in my top-level 
CMakeLists.txt the CMAKE_AUTOMOC to true
Set (CMAKE_AUTOMOC on)
As a result, in the build log there are a lot of messages like:

AUTOMOC: Checking full_path_to_header_file
AUTOMOC: Checking full_path_to_cxx_source_file

Is there a way to get rid of them?

Thank you

Dominique

 This e-mail, including any attached files, may contain confidential and 
privileged information for the sole use of the intended recipient. Any review, 
use, distribution, or disclosure by others is strictly prohibited. If you are 
not the intended recipient (or authorized to receive information for the 
intended recipient), please contact the sender by reply e-mail and delete all 
copies of this message.
-- 

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/mailman/listinfo/cmake

[CMake] Make works on linux, not on Mac Os X Mavericks, openmpi

2014-07-24 Thread Sergey Rykovanov 
Hi,

I have a very simple Hello world program that compiles with mpic++. I
also have the following CMakeLists.txt file:

cmake_minimum_required(VERSION 2.8)

project(Hello_world)

add_executable(hello.e main.cpp)
# Require MPI for this project:
find_package(MPI REQUIRED)
include_directories(MPI_INCLUDE_PATH)set(CMAKE_CXX_COMPILE_FLAGS
${CMAKE_CXX_COMPILE_FLAGS}
${MPI_COMPILE_FLAGS})set(CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS}
${MPI_LINK_FLAGS})
target_link_libraries(hello.e ${MPI_LIBRARIES}

This cmake file works perfectly on Linux, but not on Mac OS X Mavericks. On
Mavericks I get: mpi.h not found error.

Here is the output of cmake . showing that it found the openmpi:

-- The C compiler identification is AppleClang 5.1.0.5030040-- The CXX
compiler identification is AppleClang 5.1.0.5030040-- Check for
working C compiler: /usr/bin/cc-- Check for working C compiler:
/usr/bin/cc -- works-- Detecting C compiler ABI info-- Detecting C
compiler ABI info - done-- Check for working CXX compiler:
/usr/bin/c++-- Check for working CXX compiler: /usr/bin/c++ -- works--
Detecting CXX compiler ABI info-- Detecting CXX compiler ABI info -
done-- Found MPI_C: /opt/local/lib/openmpi-devel-mp/libmpi.dylib  --
Found MPI_CXX: /opt/local/lib/openmpi-devel-mp/libmpi.dylib  --
Configuring done-- Generating done-- Build files have been written to:
/Users/sleepyhead/work/MPI_TEST

What am I doing wrong?


Cheers,
Sergey
-- 

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/mailman/listinfo/cmake

Re: [CMake] Make works on linux, not on Mac Os X Mavericks, openmpi

2014-07-24 Thread Nils Gladitz 

On 07/24/2014 10:56 AM, Sergey Rykovanov wrote:


|cmake_minimum_required(VERSION2.8)

project(Hello_world)

add_executable(hello.e main.cpp)

# Require MPI for this project:
find_package(MPI REQUIRED)
include_directories(MPI_INCLUDE_PATH)
set(CMAKE_CXX_COMPILE_FLAGS ${CMAKE_CXX_COMPILE_FLAGS}  ${MPI_COMPILE_FLAGS})
set(CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS}  ${MPI_LINK_FLAGS})
target_link_libraries(hello.e ${MPI_LIBRARIES}|


include_directories(MPI_INCLUDE_PATH) adds an include directory named 
MPI_INCLUDE_PATH.


You probably meant
include_directories(${MPI_INCLUDE_PATH}) which adds the content of the 
variable MPI_INCLUDE_PATH as include directories.


Might have worked on Linux because the headers were already in standard 
include directories.


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

Re: [CMake] CMAKE changing Visual Studio Settings

2014-07-24 Thread Chuck Atkins 
Hi Joseph,

On Mon, Jul 21, 2014 at 4:51 PM, Joseph Rosensweig jrose...@gmail.com
wrote:

 ...

in my CMAKE I have places where I do things like if(CMAKE_BUILD_TYPE
 STREQUAL Debug) then do this else do that.


This is the sort of logic best achieved through generator expressions.  How
to do it specifically really depends.  Generator expressions are used all
over CMake in various different contexts so how to apply them depends on
what exactly you are trying to achieve.



 i.e. my CXX Flags will change based on the CMAKE_BUILD_TYPE ... What am I
 missing?


This is actually much simpler than the general case.  CMake has specific
compiler flags for all builds, release, debug, release with debug info, and
minimum size release.  They can be set / ammended with:

# Flags that get applied to all builds
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} /My /EXTRA /COMPILER /FLAGS)

# Flags that only apply to debug builds
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG} /ADDITIONAL /DEBUG
/ONLY /FLAGS)

# Flags that only apply to release builds
set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} /ADDITIONAL
/RELEASE /ONLY /FLAGS)

The resulting compiler flags that get used are a combination of the general
CMAKE_CXX_FLAGS and CMAKE_CXX_FLAGS for the current selected build
configuration.

Back to the first issue though, what other types of build-type specific
logic are you trying to achieve?  There may be a better / easier way.
-- 

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/mailman/listinfo/cmake

Re: [CMake] Controlling the targets in an export set

2014-07-24 Thread Adar Dembo 
Thanks, that did the trick (though I had to use LINK_PRIVATE instead of
PRIVATE; maybe I'm using an older version of cmake).

And yes, I need -fPIC code through and through. I've already taken care of
that.

And double yes, a few other targets needed to explicitly list foo's
transitive dependencies in their own target_link_libraries(). Wasn't too
hard to fix though.


On Thu, Jul 24, 2014 at 12:15 AM, Nils Gladitz nilsglad...@gmail.com
wrote:

 On 07/24/2014 01:57 AM, Adar Dembo wrote:

 I have a project that generates a shared library foo. As part of the
 build, the bar1, bar2, and bar3 static archives are created, and
 eventually, foo is linked against all of them. Thus, the project's sole
 deliverable is libfoo.so; all the necessary symbols from the bar1..bar3
 archives are found within libfoo.so.

 If I try to export foo using install(TARGETS foo EXPORT foo ...) and
 install(EXPORT foo ...), cmake complains that target foo requires
 targets bar1, bar2, and bar3, which are not in the export set. I have to
 add install(TARGETS bar1 EXPORT foo ...) for bar1..bar3 if I want this
 to succeed. However, this also means that I'm exporting my static
 archives, which as I wrote earlier aren't necessary.

 How can I exercise finer-grained control over foo's export set? How can
 I build an export set containing foo but excluding bar1, bar2, and bar3?


 You can link your static libraries to your shared library privately hence
 removing them from foo's interface:

   target_link_libraries(foo PRIVATE bar1 bar2 bar3)

 You are probably already aware but just in case ...

 To portably link archives to shared libraries you need position
 independent code[1].

 Of the objects contained in your archives only those will get included
 which are required to resolve some reference when creating libfoo.so.
 Symbols that were contained in objects which were not required in the link
 will hence not be available.

 This might seemed to have worked within the project until now given that
 the archives were in your link interface.

 Nils

 [1] http://cmake.org/cmake/help/v3.0/prop_tgt/POSITION_
 INDEPENDENT_CODE.html

-- 

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/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.0.0-4476-gd43aa3f

2014-07-24 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  d43aa3f5f438c407995fcb9c7f1702666ad1f04d (commit)
   via  2eaf208bba50cf120ddcdd0fc5bb078b5996b840 (commit)
  from  8f819c4968965da6864b39446885e6ee51eb5d54 (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=d43aa3f5f438c407995fcb9c7f1702666ad1f04d
commit d43aa3f5f438c407995fcb9c7f1702666ad1f04d
Merge: 8f819c4 2eaf208
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 09:05:07 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 09:05:07 2014 -0400

Merge topic 'cpack-ifw-generator' into next

2eaf208b CMakeCPack: Fix for CMake  2.8.9


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eaf208bba50cf120ddcdd0fc5bb078b5996b840
commit 2eaf208bba50cf120ddcdd0fc5bb078b5996b840
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 09:02:32 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 09:04:35 2014 -0400

CMakeCPack: Fix for CMake  2.8.9

The CMAKE_INSTALL_DEFAULT_COMPONENT_NAME is not defined prior
to CMake 2.8.9.

diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 9d56779..5b096ad 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -66,7 +66,11 @@ if(EXISTS ${CMAKE_ROOT}/Modules/CPack.cmake)
   endif()
 
   # default component for IFW
-  set(_CPACK_IFW_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
+  if(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
+set(_CPACK_IFW_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
+  else()
+set(_CPACK_IFW_COMPONENT_NAME Unspecified)
+  endif()
   string(TOUPPER ${_CPACK_IFW_COMPONENT_NAME} _CPACK_IFW_COMPONENT_UNAME)
 
   if(${CMAKE_SYSTEM_NAME} MATCHES Windows)

---

Summary of changes:
 CMakeCPack.cmake |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4479-g8485d72

2014-07-24 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  8485d720847ef5a4b60549bda4291b781951ed46 (commit)
   via  c63d4d54d01d84297743fc0f48e1292df37290a2 (commit)
   via  bf91e8362876c2be2fc6f6a16e8897a7a9cd963e (commit)
  from  d43aa3f5f438c407995fcb9c7f1702666ad1f04d (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=8485d720847ef5a4b60549bda4291b781951ed46
commit 8485d720847ef5a4b60549bda4291b781951ed46
Merge: d43aa3f c63d4d5
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 09:33:16 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 09:33:16 2014 -0400

Merge topic 'add-liblzma' into next

c63d4d54 liblzma: Remove use of MSVC intrinsic
bf91e836 liblzma: Suppress MSVC warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c63d4d54d01d84297743fc0f48e1292df37290a2
commit c63d4d54d01d84297743fc0f48e1292df37290a2
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 09:30:09 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 09:30:09 2014 -0400

liblzma: Remove use of MSVC intrinsic

diff --git a/Utilities/cmliblzma/common/tuklib_integer.h 
b/Utilities/cmliblzma/common/tuklib_integer.h
index e8cb6bf..5e8262a 100644
--- a/Utilities/cmliblzma/common/tuklib_integer.h
+++ b/Utilities/cmliblzma/common/tuklib_integer.h
@@ -387,13 +387,6 @@ bsr32(uint32_t n)
__asm__(bsrl %1, %0 : =r (i) : rm (n));
return i;
 
-#elif defined(_MSC_VER)  _MSC_VER = 1400
-   // MSVC isn't supported by tuklib, but since this code exists,
-   // it doesn't hurt to have it here anyway.
-   uint32_t i;
-   _BitScanReverse(i, n);
-   return i;
-
 #else
uint32_t i = 31;
 
@@ -441,11 +434,6 @@ clz32(uint32_t n)
: =r (i) : rm (n));
return i;
 
-#elif defined(_MSC_VER)  _MSC_VER = 1400
-   uint32_t i;
-   _BitScanReverse(i, n);
-   return i ^ 31U;
-
 #else
uint32_t i = 0;
 
@@ -491,11 +479,6 @@ ctz32(uint32_t n)
__asm__(bsfl %1, %0 : =r (i) : rm (n));
return i;
 
-#elif defined(_MSC_VER)  _MSC_VER = 1400
-   uint32_t i;
-   _BitScanForward(i, n);
-   return i;
-
 #else
uint32_t i = 0;
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf91e8362876c2be2fc6f6a16e8897a7a9cd963e
commit bf91e8362876c2be2fc6f6a16e8897a7a9cd963e
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 09:14:53 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 09:14:53 2014 -0400

liblzma: Suppress MSVC warnings

diff --git a/Utilities/cmliblzma/common/sysdefs.h 
b/Utilities/cmliblzma/common/sysdefs.h
index 7481e3d..2bcaeb3 100644
--- a/Utilities/cmliblzma/common/sysdefs.h
+++ b/Utilities/cmliblzma/common/sysdefs.h
@@ -17,7 +17,7 @@
 #define LZMA_SYSDEFS_H
 
 #if defined(_MSC_VER)
-#  pragma warning(disable: 4028 4244 4761)
+# pragma warning(push,1)
 #endif
 
 //

---

Summary of changes:
 Utilities/cmliblzma/common/sysdefs.h|2 +-
 Utilities/cmliblzma/common/tuklib_integer.h |   17 -
 2 files changed, 1 insertion(+), 18 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4481-ge307402

2014-07-24 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  e30740211b432a546e9884149f92df0fb75f1c77 (commit)
   via  606d3df4e2712a534f3e773cb1524c2929c85c01 (commit)
  from  8485d720847ef5a4b60549bda4291b781951ed46 (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=e30740211b432a546e9884149f92df0fb75f1c77
commit e30740211b432a546e9884149f92df0fb75f1c77
Merge: 8485d72 606d3df
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 10:54:16 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 10:54:16 2014 -0400

Merge topic 'add-liblzma' into next

606d3df4 liblzma: Avoid defining a 'restrict' macro


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=606d3df4e2712a534f3e773cb1524c2929c85c01
commit 606d3df4e2712a534f3e773cb1524c2929c85c01
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 10:51:21 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 10:52:36 2014 -0400

liblzma: Avoid defining a 'restrict' macro

Any #define restrict ... line may conflict with MSVC header files
that use __declspec(restrict).  Define our own LZMA_RESTRICT macro
in Utilities/cmliblzma/config.h.in and transform liblzma code to
use it:

 git grep -lE '\restrict\' Utilities/cmliblzma/liblzma |
   xargs sed -i 's/\restrict\/LZMA_RESTRICT/g'

diff --git a/Utilities/cmliblzma/config.h.in b/Utilities/cmliblzma/config.h.in
index 391bb87..b197f27 100644
--- a/Utilities/cmliblzma/config.h.in
+++ b/Utilities/cmliblzma/config.h.in
@@ -188,10 +188,12 @@ typedef uint64_t uintmax_t;
 
 #ifndef HAVE_RESTRICT
 #  ifdef HAVE___RESTRICT
-#define restrict __restrict
+#define LZMA_RESTRICT __restrict
 #  else
-#define restrict
+#define LZMA_RESTRICT
 #  endif
+#else
+#  define LZMA_RESTRICT restrict
 #endif /* HAVE_RESTRICT */
 
 #ifndef HAVE_INLINE
diff --git a/Utilities/cmliblzma/liblzma/common/alone_decoder.c 
b/Utilities/cmliblzma/liblzma/common/alone_decoder.c
index a20cf49..5f5e564 100644
--- a/Utilities/cmliblzma/liblzma/common/alone_decoder.c
+++ b/Utilities/cmliblzma/liblzma/common/alone_decoder.c
@@ -52,9 +52,9 @@ struct lzma_coder_s {
 static lzma_ret
 alone_decode(lzma_coder *coder,
lzma_allocator *allocator lzma_attribute((__unused__)),
-   const uint8_t *restrict in, size_t *restrict in_pos,
-   size_t in_size, uint8_t *restrict out,
-   size_t *restrict out_pos, size_t out_size,
+   const uint8_t *LZMA_RESTRICT in, size_t *LZMA_RESTRICT in_pos,
+   size_t in_size, uint8_t *LZMA_RESTRICT out,
+   size_t *LZMA_RESTRICT out_pos, size_t out_size,
lzma_action action)
 {
while (*out_pos  out_size
diff --git a/Utilities/cmliblzma/liblzma/common/alone_encoder.c 
b/Utilities/cmliblzma/liblzma/common/alone_encoder.c
index 62df126..4207b4a 100644
--- a/Utilities/cmliblzma/liblzma/common/alone_encoder.c
+++ b/Utilities/cmliblzma/liblzma/common/alone_encoder.c
@@ -33,9 +33,9 @@ struct lzma_coder_s {
 static lzma_ret
 alone_encode(lzma_coder *coder,
lzma_allocator *allocator lzma_attribute((__unused__)),
-   const uint8_t *restrict in, size_t *restrict in_pos,
-   size_t in_size, uint8_t *restrict out,
-   size_t *restrict out_pos, size_t out_size,
+   const uint8_t *LZMA_RESTRICT in, size_t *LZMA_RESTRICT in_pos,
+   size_t in_size, uint8_t *LZMA_RESTRICT out,
+   size_t *LZMA_RESTRICT out_pos, size_t out_size,
lzma_action action)
 {
while (*out_pos  out_size)
diff --git a/Utilities/cmliblzma/liblzma/common/auto_decoder.c 
b/Utilities/cmliblzma/liblzma/common/auto_decoder.c
index 6f3c862..24cf489 100644
--- a/Utilities/cmliblzma/liblzma/common/auto_decoder.c
+++ b/Utilities/cmliblzma/liblzma/common/auto_decoder.c
@@ -31,9 +31,9 @@ struct lzma_coder_s {
 
 static lzma_ret
 auto_decode(lzma_coder *coder, lzma_allocator *allocator,
-   const uint8_t *restrict in, size_t *restrict in_pos,
-   size_t in_size, uint8_t *restrict out,
-   size_t *restrict out_pos, size_t out_size, lzma_action action)
+   const uint8_t *LZMA_RESTRICT in, size_t *LZMA_RESTRICT in_pos,
+   size_t in_size, uint8_t *LZMA_RESTRICT out,
+   size_t *LZMA_RESTRICT out_pos, size_t out_size, lzma_action 
action)
 {
switch (coder-sequence) {
case SEQ_INIT:
diff --git a/Utilities/cmliblzma/liblzma/common/block_decoder.c

[Cmake-commits] CMake branch, next, updated. v3.0.0-4483-g696730b

2014-07-24 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  696730b8850263ff439722e7e8cc009179f54a8c (commit)
   via  28cbcb351cafbebc2fe86a1a3b02561a69106ff5 (commit)
  from  e30740211b432a546e9884149f92df0fb75f1c77 (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=696730b8850263ff439722e7e8cc009179f54a8c
commit 696730b8850263ff439722e7e8cc009179f54a8c
Merge: e307402 28cbcb3
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 10:57:49 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 10:57:49 2014 -0400

Merge topic 'add-liblzma' into next

28cbcb35 Help: Add notes for topic 'add-liblzma'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28cbcb351cafbebc2fe86a1a3b02561a69106ff5
commit 28cbcb351cafbebc2fe86a1a3b02561a69106ff5
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 10:57:57 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 10:57:57 2014 -0400

Help: Add notes for topic 'add-liblzma'

diff --git a/Help/release/dev/add-liblzma.rst b/Help/release/dev/add-liblzma.rst
new file mode 100644
index 000..a59ec09
--- /dev/null
+++ b/Help/release/dev/add-liblzma.rst
@@ -0,0 +1,5 @@
+add-liblzma
+---
+
+* The :manual:`cmake(1)` ``-E tar`` command learned to support
+  lzma-compressed files.

---

Summary of changes:
 Help/release/dev/add-liblzma.rst |5 +
 1 file changed, 5 insertions(+)
 create mode 100644 Help/release/dev/add-liblzma.rst


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4485-g6ea3b0d

2014-07-24 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  6ea3b0d99f179a85fc432a7e710bf2857fc5f7a5 (commit)
   via  da95567b89924c0e217caa04db85c0a1258c16ac (commit)
  from  696730b8850263ff439722e7e8cc009179f54a8c (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=6ea3b0d99f179a85fc432a7e710bf2857fc5f7a5
commit 6ea3b0d99f179a85fc432a7e710bf2857fc5f7a5
Merge: 696730b da95567
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 11:06:06 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 11:06:06 2014 -0400

Merge topic 'cpack-ifw-generator' into next

da95567b Help: Add notes for topic 'cpack-ifw-generator'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da95567b89924c0e217caa04db85c0a1258c16ac
commit da95567b89924c0e217caa04db85c0a1258c16ac
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 11:07:14 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 11:07:14 2014 -0400

Help: Add notes for topic 'cpack-ifw-generator'

diff --git a/Help/release/dev/cpack-ifw-generator.rst 
b/Help/release/dev/cpack-ifw-generator.rst
new file mode 100644
index 000..f667136
--- /dev/null
+++ b/Help/release/dev/cpack-ifw-generator.rst
@@ -0,0 +1,5 @@
+cpack-ifw-generator
+---
+
+* :manual:`cpack(1)` gained an ``IFW`` generator to package using
+  Qt Framework Installer tools.  See the :module:`CPackIFW` module.

---

Summary of changes:
 Help/release/dev/cpack-ifw-generator.rst |5 +
 1 file changed, 5 insertions(+)
 create mode 100644 Help/release/dev/cpack-ifw-generator.rst


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4488-gcefe04f

2014-07-24 Thread Bill Hoffman 
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  cefe04f03d6888be7a80509225f2f6f509d445a6 (commit)
   via  5d40d88e0026824e237938a9e771206220857034 (commit)
   via  afe21fc3c43af0c031a77b3b48041d35f248f481 (commit)
  from  6ea3b0d99f179a85fc432a7e710bf2857fc5f7a5 (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=cefe04f03d6888be7a80509225f2f6f509d445a6
commit cefe04f03d6888be7a80509225f2f6f509d445a6
Merge: 6ea3b0d 5d40d88
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jul 24 11:32:04 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 11:32:04 2014 -0400

Merge topic 'sanitizer_handle_more_pids' into next

5d40d88e Handle more than one process with sanitizer errors.
afe21fc3 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d40d88e0026824e237938a9e771206220857034
commit 5d40d88e0026824e237938a9e771206220857034
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jul 24 11:25:59 2014 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Thu Jul 24 11:25:59 2014 -0400

Handle more than one process with sanitizer errors.

Since the Sanitizers write out one log file per process, a single
test might have more than one log file. This commit allows ctest
to read all of the log files found for a particual test.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx 
b/Source/CTest/cmCTestMemCheckHandler.cxx
index ed57949..ced7982 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -1127,7 +1127,13 @@ 
cmCTestMemCheckHandler::PostProcessTest(cmCTestTestResult res,
 }
   else
 {
-this-AppendMemTesterOutput(res, test);
+std::vectorstd::string files;
+this-TestOutputFileNames(test, files);
+for(std::vectorstd::string::iterator i = files.begin();
+i != files.end(); ++i)
+  {
+  this-AppendMemTesterOutput(res, *i);
+  }
 }
 }
 
@@ -1141,11 +1147,13 @@ 
cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult res,
   cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT,
  PostProcessBoundsCheckerTest for : 
   res.Name  std::endl);
-  std::string ofile = this-TestOutputFileName(test);
-  if ( ofile.empty() )
+  std::vectorstd::string files;
+  this-TestOutputFileNames(test, files);
+  if ( files.size() == 0 )
 {
 return;
 }
+  std::string ofile = files[0];
   // put a scope around this to close ifs so the file can be removed
   {
   cmsys::ifstream ifs(ofile.c_str());
@@ -1175,9 +1183,8 @@ 
cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult res,
 
 void
 cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult res,
-  int test)
+  std::string const ofile)
 {
-  std::string ofile = this-TestOutputFileName(test);
   if ( ofile.empty() )
 {
 return;
@@ -1205,8 +1212,9 @@ 
cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult res,
 }
 }
 
-std::string
-cmCTestMemCheckHandler::TestOutputFileName(int test)
+void cmCTestMemCheckHandler::TestOutputFileNames(int test,
+ std::vectorstd::string
+ files)
 {
   std::string index;
   cmOStringStream stream;
@@ -1229,7 +1237,8 @@ cmCTestMemCheckHandler::TestOutputFileName(int test)
   }
 else
   {
-  ofile = g.GetFiles()[0];
+  files = g.GetFiles();
+  return;
   }
 }
   else if ( !cmSystemTools::FileExists(ofile.c_str()) )
@@ -1239,5 +1248,5 @@ cmCTestMemCheckHandler::TestOutputFileName(int test)
 cmCTestLog(this-CTest, ERROR_MESSAGE, log.c_str()  std::endl);
 ofile = ;
 }
-  return ofile;
+  files.push_back(ofile);
 }
diff --git a/Source/CTest/cmCTestMemCheckHandler.h 
b/Source/CTest/cmCTestMemCheckHandler.h
index 2630fde..2195dab 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -145,10 +145,10 @@ private:
 
   ///! append MemoryTesterOutputFile to the test log
   void AppendMemTesterOutput(cmCTestTestHandler::cmCTestTestResult res,
- int test);
+ std::string const filename);
 
   ///! generate the output filename for the given test index
-  std::string TestOutputFileName(int test);
+  void TestOutputFileNames(int test, std::vectorstd::string files);
 };
 
 #endif
diff --git a/Tests/CTestTestMemcheck/testLeakSanitizer.cmake

[Cmake-commits] CMake branch, next, updated. v3.0.0-4490-g807661b

2014-07-24 Thread Bill Hoffman 
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  807661bce77368f303b4b5b95f41fd2c4e3131f2 (commit)
   via  0e88b1d6d92b32b767dff33109855f079a272f00 (commit)
  from  cefe04f03d6888be7a80509225f2f6f509d445a6 (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=807661bce77368f303b4b5b95f41fd2c4e3131f2
commit 807661bce77368f303b4b5b95f41fd2c4e3131f2
Merge: cefe04f 0e88b1d
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jul 24 11:34:48 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 11:34:48 2014 -0400

Merge topic 'fix_qt4_automoc_leak' into next

0e88b1d6 Fix memory leak of local generator detected by LeakSanitizer.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e88b1d6d92b32b767dff33109855f079a272f00
commit 0e88b1d6d92b32b767dff33109855f079a272f00
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jul 24 11:33:54 2014 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Thu Jul 24 11:33:54 2014 -0400

Fix memory leak of local generator detected by LeakSanitizer.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index cc6932d..d4d565c 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1000,6 +1000,7 @@ bool cmQtAutoGenerators::Run(const std::string 
targetDirectory,
 
   this-WriteOldMocDefinitionsFile(targetDirectory);
 
+  delete gg-GetCurrentLocalGenerator();
   delete gg;
   gg = NULL;
   makefile = NULL;

---

Summary of changes:
 Source/cmQtAutoGenerators.cxx |1 +
 1 file changed, 1 insertion(+)


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4492-ga790821

2014-07-24 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  a79082165eb56ae51dddb7d9a68b45fd9dea1184 (commit)
   via  051fb2e22fedccd6ecc9bd6840c8ee6bcc1b26af (commit)
  from  807661bce77368f303b4b5b95f41fd2c4e3131f2 (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=a79082165eb56ae51dddb7d9a68b45fd9dea1184
commit a79082165eb56ae51dddb7d9a68b45fd9dea1184
Merge: 807661b 051fb2e
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 12:48:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 12:48:28 2014 -0400

Merge topic 'fix-broken-re-cmake' into next

051fb2e2 Revert cmake: Avoid overwriting compiler name if specified 
repeatedly.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=051fb2e22fedccd6ecc9bd6840c8ee6bcc1b26af
commit 051fb2e22fedccd6ecc9bd6840c8ee6bcc1b26af
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 12:49:33 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 12:49:33 2014 -0400

Revert cmake: Avoid overwriting compiler name if specified repeatedly.

This reverts commit a12e4e782c9c8d290071a3fb8f8abcf5cba24afe.
We will use another approach to resolve this problem.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3e4ae17..a051c87 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -355,36 +355,6 @@ bool cmake::SetCacheArgs(const std::vectorstd::string 
args)
 }
   }
 
-cmsys::RegularExpression compilerRex(^CMAKE_[a-zA-Z]+_COMPILER$);
-if (compilerRex.find(var))
-  {
-  std::string newVal = cmSystemTools::FindProgram(value.c_str());
-  const char* existing =
-  this-CacheManager-GetCacheValue(var.c_str());
-  if (existing  existing == newVal)
-{
-// Repeated invocation of cmake with arguments specifying a
-// compiler, such as -DCMAKE_CXX_COMPILER=clang++, should not
-// re-populate the cache with the un-resolved name.  On the
-// first run of cmake, the CMakeDetermineCXXCompiler.cmake logic
-// is executed and the result is resolved to a full path and
-// cached,  On subsequent runs of cmake, we wish to avoid
-// re-executing the CMakeDetermineCXXCompiler.cmake logic.
-// The cmGlobalGenerator::ResolveLanguageCompiler method is
-// responsible for ensuring that the cache is deleted if the
-// value in the cache is changed.
-// A scripting environment can invoke cmake on the command line
-// with arguments specifying the compiler in a way which is
-// intended to give reproducible results.  Ignore the value
-// specified on the command line if it results in the same
-// value as is already in the cache.  Otherwise,
-// cmMakefile::AddCacheDefinition would use CollapseFullPath on
-// the entry, incorrectly resolving 'clang++' to
-// 'CMAKE_BUILD_DIR/clang++', which is unlikely to exist.
-continue;
-}
-  }
-
 this-CacheManager-AddCacheEntry(var, value.c_str(),
   No help, variable specified on the command line., type);
 

---

Summary of changes:
 Source/cmake.cxx |   30 --
 1 file changed, 30 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4498-g74bdbe6

2014-07-24 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  74bdbe6e7400afc49a7223295cf0e5e078b1c478 (commit)
   via  1342e0222fed06f748f266a3a4e82c907cb76726 (commit)
   via  6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 (commit)
  from  3a60ea462359e6ef58a914d89cef3226229b43d0 (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=74bdbe6e7400afc49a7223295cf0e5e078b1c478
commit 74bdbe6e7400afc49a7223295cf0e5e078b1c478
Merge: 3a60ea4 1342e02
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 13:43:50 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 13:43:50 2014 -0400

Merge topic 'FindImageMagick-arch-include-dir' into next

1342e022 FindImageMagick: Provide per-component include dirs (#15007)
6f5581c1 FindImageMagick: Find arch include dir (#15007)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1342e0222fed06f748f266a3a4e82c907cb76726
commit 1342e0222fed06f748f266a3a4e82c907cb76726
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 15:33:48 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 23 15:33:48 2014 -0400

FindImageMagick: Provide per-component include dirs (#15007)

Set the ImageMagick_component_INCLUDE_DIRS variable that is mentioned
in the documentation but was not set before.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 33f95ce..65458b7 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -143,13 +143,20 @@ function(FIND_IMAGEMAGICK_API component header)
   if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
 set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
 
-list(APPEND ImageMagick_INCLUDE_DIRS
+# Construct per-component include directories.
+set(ImageMagick_${component}_INCLUDE_DIRS
   ${ImageMagick_${component}_INCLUDE_DIR}
   )
 if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
-  list(APPEND ImageMagick_INCLUDE_DIRS
+  list(APPEND ImageMagick_${component}_INCLUDE_DIRS
 ${ImageMagick_${component}_ARCH_INCLUDE_DIR})
 endif()
+list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS)
+set(ImageMagick_${component}_INCLUDE_DIRS
+  ${ImageMagick_${component}_INCLUDE_DIRS} PARENT_SCOPE)
+
+# Add the per-component include directories to the full include dirs.
+list(APPEND ImageMagick_INCLUDE_DIRS 
${ImageMagick_${component}_INCLUDE_DIRS})
 list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
 set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f5581c105d59ed00cc065b9ab9b3c8c0a441db3
commit 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3
Author: bastien ROUCARIES roucaries.bast...@gmail.com
AuthorDate: Tue Jul 22 22:24:15 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 23 09:44:55 2014 -0400

FindImageMagick: Find arch include dir (#15007)

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index f6c8b3a..33f95ce 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -115,7 +115,19 @@ function(FIND_IMAGEMAGICK_API component header)
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
 PATH_SUFFIXES
   ImageMagick ImageMagick-6
-DOC Path to the ImageMagick include dir.
+DOC Path to the ImageMagick arch-independent include dir.
+)
+  find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
+NAMES magick/magick-baseconfig.h
+HINTS
+  ${PC_${component}_INCLUDEDIR}
+  ${PC_${component}_INCLUDE_DIRS}
+PATHS
+  ${ImageMagick_INCLUDE_DIRS}
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
+PATH_SUFFIXES
+  ImageMagick ImageMagick-6
+DOC Path to the ImageMagick arch-specific include dir.
 )
   find_library(ImageMagick_${component}_LIBRARY
 NAMES ${ARGN}
@@ -127,12 +139,17 @@ function(FIND_IMAGEMAGICK_API component header)
 DOC Path to the ImageMagick Magick++ library.
 )
 
+  # old version have only indep dir
   if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
 set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
 
 list(APPEND ImageMagick_INCLUDE_DIRS
   ${ImageMagick_${component}_INCLUDE_DIR}
   )
+if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
+  list(APPEND ImageMagick_INCLUDE_DIRS
+${ImageMagick_${component}_ARCH_INCLUDE_DIR})
+endif()
 list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)

[Cmake-commits] CMake branch, next, updated. v3.0.0-4495-g3a60ea4

2014-07-24 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  3a60ea462359e6ef58a914d89cef3226229b43d0 (commit)
   via  8981513a810a97d10e299407e12c46aabe68f00a (commit)
   via  731427a646cd0ca81aa392872d18d125e917bf47 (commit)
  from  a79082165eb56ae51dddb7d9a68b45fd9dea1184 (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=3a60ea462359e6ef58a914d89cef3226229b43d0
commit 3a60ea462359e6ef58a914d89cef3226229b43d0
Merge: a790821 8981513
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 13:41:17 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 13:41:17 2014 -0400

Merge topic 'fix-re-cmake-with-compiler' into next

8981513a CMakeDetermineCompiler: Simplify CMAKE_LANG_COMPILER default 
force-cache
731427a6 cmGlobalGenerator: Do not re-add CMAKE_LANG_COMPILER


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8981513a810a97d10e299407e12c46aabe68f00a
commit 8981513a810a97d10e299407e12c46aabe68f00a
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 13:10:05 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 13:37:07 2014 -0400

CMakeDetermineCompiler: Simplify CMAKE_LANG_COMPILER default force-cache

If find_program does not find CMAKE_LANG_COMPILER, use set_property()
to force the value to be that of CMAKE_LANG_COMPILER_INIT instead of
set().  This allows us to set the value without re-specifying the type
and documentation, thus preserving what find_program set.

diff --git a/Modules/CMakeDetermineCompiler.cmake 
b/Modules/CMakeDetermineCompiler.cmake
index cd0f8b8..0ab3af6 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -65,7 +65,7 @@ macro(_cmake_find_compiler lang)
   endif()
   find_program(CMAKE_${lang}_COMPILER NAMES ${CMAKE_${lang}_COMPILER_LIST} DOC 
${lang} compiler)
   if(CMAKE_${lang}_COMPILER_INIT AND NOT CMAKE_${lang}_COMPILER)
-set(CMAKE_${lang}_COMPILER ${CMAKE_${lang}_COMPILER_INIT} CACHE FILEPATH 
${lang} compiler FORCE)
+set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE 
${CMAKE_${lang}_COMPILER_INIT})
   endif()
   unset(_${lang}_COMPILER_HINTS)
   unset(_languages)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=731427a646cd0ca81aa392872d18d125e917bf47
commit 731427a646cd0ca81aa392872d18d125e917bf47
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 12:44:05 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jul 24 13:31:14 2014 -0400

cmGlobalGenerator: Do not re-add CMAKE_LANG_COMPILER

The cmGlobalGenerator::ResolveLanguageCompiler method, invoked only by
Makefile generators, contains code originally added by commit v2.4.0~796
(..., add new generators for msys and mingw, 2005-12-22) to compute the
full path to the compiler and save the result back into the cache value.
Since then the CMakeDetermine*Compiler modules have learned to resolve
the full path to the compiler and save it in CMake*Compiler.cmake files
configured in the build tree.  The value of CMAKE_LANG_COMPILER in the
cache is now only for reference of what the user originally specified.
The full path is now available in a normal variable of the same name,
and this is used by project code and the generators.

When the user specifies -DCMAKE_LANG_COMPILER=name on the command-line
of an existing build tree that uses a Makefile generator, it is first
stored in the cache with an uninitialized type.  Then later when
ResolveLanguageCompiler updates the cache entry and sets the type to
FILEPATH, cmMakefile::AddCacheDefinition does CollapseFullPath on the
name and ends up with something like $PWD/name which is unlikely to
be correct.  Furthermore, cmMakefile::AddCacheDefinition proceeds to
remove the normal variable of the same name, so the value originally
saved in CMakeLANGCompiler.cmake is ignored and the generators use the
wrong path to the compiler.

Resolve this by dropping the code from ResolveLanguageCompiler that
touches the cache value of CMAKE_LANG_COMPILER.  As explained above it
is no longer needed anyway.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ae6861e..249373c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -148,8 +148,6 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const 
std::string lang,
 {
 return;
 }
-  std::string doc = lang;
-  doc +=  compiler.;
   const char* cname = this-GetCMakeInstance()-

[Cmake-commits] CMake branch, next, updated. v3.0.0-4501-g6b02906

2014-07-24 Thread Nils Gladitz 
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  6b02906522196cfc2f8c9c29fb3f483d6d5b61ff (commit)
   via  5e902985975f99a54522044f7e920cd881e91a4e (commit)
   via  a6effabaa53f0ca3db31a81b50f7e99a9b2b976c (commit)
  from  74bdbe6e7400afc49a7223295cf0e5e078b1c478 (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=6b02906522196cfc2f8c9c29fb3f483d6d5b61ff
commit 6b02906522196cfc2f8c9c29fb3f483d6d5b61ff
Merge: 74bdbe6 5e90298
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 16:31:54 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 16:31:54 2014 -0400

Merge topic 'pdb-genex' into next

5e902985 Genex: Implement generator expressions for target PDB files.
a6effaba Genex: Simplify filesytem artifact code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e902985975f99a54522044f7e920cd881e91a4e
commit 5e902985975f99a54522044f7e920cd881e91a4e
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 22:18:21 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Thu Jul 24 22:18:21 2014 +0200

Genex: Implement generator expressions for target PDB files.

diff --git a/Help/manual/cmake-generator-expressions.7.rst 
b/Help/manual/cmake-generator-expressions.7.rst
index bc24798..4f55687 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -148,6 +148,12 @@ than 4.2.0.
   Name of file with soname (.so.3).
 ``$TARGET_SONAME_FILE_DIR:tgt``
   Directory of with soname (.so.3).
+``$TARGET_PDB_FILE:tgt``
+  Full path to program database file (.pdb) where ``tgt`` is the name of a 
target.
+``$TARGET_PDB_FILE_NAME:tgt``
+  Name of program database file (.pdb).
+``$TARGET_PDB_FILE_DIR:tgt``
+  Directory of program database file (.pdb).
 ``$TARGET_PROPERTY:tgt,prop``
   Value of the property ``prop`` on the target ``tgt``.
 
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx 
b/Source/cmGeneratorExpressionEvaluator.cxx
index 7e77e4a..8c7c53b 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1512,6 +1512,7 @@ static const struct InstallPrefixNode : public 
cmGeneratorExpressionNode
 class ArtifactNameTag;
 class ArtifactLinkerTag;
 class ArtifactSonameTag;
+class ArtifactPdbTag;
 
 class ArtifactPathTag;
 class ArtifactDirTag;
@@ -1558,6 +1559,21 @@ struct 
TargetFilesystemArtifactResultCreatorArtifactSonameTag
 
 //
 template
+struct TargetFilesystemArtifactResultCreatorArtifactPdbTag
+{
+  static std::string Create(cmTarget* target,
+cmGeneratorExpressionContext *context,
+const GeneratorExpressionContent *content)
+  {
+std::string result = target-GetPDBDirectory(context-Config);
+result += /;
+result += target-GetPDBName(context-Config);
+return result;
+  }
+};
+
+//
+template
 struct TargetFilesystemArtifactResultCreatorArtifactLinkerTag
 {
   static std::string Create(cmTarget* target,
@@ -1702,6 +1718,9 @@ TargetFilesystemArtifactNodeGroupArtifactLinkerTag 
targetLinkerNodeGroup;
 static const
 TargetFilesystemArtifactNodeGroupArtifactSonameTag targetSoNameNodeGroup;
 
+static const
+TargetFilesystemArtifactNodeGroupArtifactPdbTag targetPdbNodeGroup;
+
 //
 static const
 cmGeneratorExpressionNode* GetNode(const std::string identifier)
@@ -1729,12 +1748,15 @@ cmGeneratorExpressionNode* GetNode(const std::string 
identifier)
 nodeMap[TARGET_FILE] = targetNodeGroup.File;
 nodeMap[TARGET_LINKER_FILE] = targetLinkerNodeGroup.File;
 nodeMap[TARGET_SONAME_FILE] = targetSoNameNodeGroup.File;
+nodeMap[TARGET_PDB_FILE] = targetPdbNodeGroup.File;
 nodeMap[TARGET_FILE_NAME] = targetNodeGroup.FileName;
 nodeMap[TARGET_LINKER_FILE_NAME] = targetLinkerNodeGroup.FileName;
 nodeMap[TARGET_SONAME_FILE_NAME] = targetSoNameNodeGroup.FileName;
+nodeMap[TARGET_PDB_FILE_NAME] = targetPdbNodeGroup.FileName;
 nodeMap[TARGET_FILE_DIR] = targetNodeGroup.FileDir;
 nodeMap[TARGET_LINKER_FILE_DIR] = targetLinkerNodeGroup.FileDir;
 nodeMap[TARGET_SONAME_FILE_DIR] = targetSoNameNodeGroup.FileDir;
+nodeMap[TARGET_PDB_FILE_DIR] = targetPdbNodeGroup.FileDir;
 nodeMap[STREQUAL] = strEqualNode;
 nodeMap[EQUAL] = equalNode;
 nodeMap[LOWER_CASE] = lowerCaseNode;

[Cmake-commits] CMake branch, next, updated. v3.0.0-4503-g58587a8

2014-07-24 Thread Nils Gladitz 
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  58587a8eb5cfe70478b8890980474f342e702421 (commit)
   via  1c5847871b490a0335d713f858e4f2ccc3fb2215 (commit)
  from  6b02906522196cfc2f8c9c29fb3f483d6d5b61ff (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=58587a8eb5cfe70478b8890980474f342e702421
commit 58587a8eb5cfe70478b8890980474f342e702421
Merge: 6b02906 1c58478
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 16:46:44 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 16:46:44 2014 -0400

Merge topic 'pdb-genex' into next

1c584787 Genex: Fix unused parameter warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c5847871b490a0335d713f858e4f2ccc3fb2215
commit 1c5847871b490a0335d713f858e4f2ccc3fb2215
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 22:46:26 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Thu Jul 24 22:46:26 2014 +0200

Genex: Fix unused parameter warning

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx 
b/Source/cmGeneratorExpressionEvaluator.cxx
index 8c7c53b..0477afb 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1563,7 +1563,7 @@ struct 
TargetFilesystemArtifactResultCreatorArtifactPdbTag
 {
   static std::string Create(cmTarget* target,
 cmGeneratorExpressionContext *context,
-const GeneratorExpressionContent *content)
+const GeneratorExpressionContent *)
   {
 std::string result = target-GetPDBDirectory(context-Config);
 result += /;

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.0.0-4505-g967d9be

2014-07-24 Thread Nils Gladitz 
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  967d9be1cca9681872aeaf91f5a3b099e8e3b253 (commit)
   via  a77ed8bfb8b9fae0b66e39d07de563b6991210c7 (commit)
  from  58587a8eb5cfe70478b8890980474f342e702421 (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=967d9be1cca9681872aeaf91f5a3b099e8e3b253
commit 967d9be1cca9681872aeaf91f5a3b099e8e3b253
Merge: 58587a8 a77ed8b
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 16:47:34 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 24 16:47:34 2014 -0400

Merge topic 'pdb-genex' into next

a77ed8bf Genex: Implement generator expressions for target PDB files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a77ed8bfb8b9fae0b66e39d07de563b6991210c7
commit a77ed8bfb8b9fae0b66e39d07de563b6991210c7
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 22:18:21 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Thu Jul 24 22:47:14 2014 +0200

Genex: Implement generator expressions for target PDB files.

diff --git a/Help/manual/cmake-generator-expressions.7.rst 
b/Help/manual/cmake-generator-expressions.7.rst
index bc24798..4f55687 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -148,6 +148,12 @@ than 4.2.0.
   Name of file with soname (.so.3).
 ``$TARGET_SONAME_FILE_DIR:tgt``
   Directory of with soname (.so.3).
+``$TARGET_PDB_FILE:tgt``
+  Full path to program database file (.pdb) where ``tgt`` is the name of a 
target.
+``$TARGET_PDB_FILE_NAME:tgt``
+  Name of program database file (.pdb).
+``$TARGET_PDB_FILE_DIR:tgt``
+  Directory of program database file (.pdb).
 ``$TARGET_PROPERTY:tgt,prop``
   Value of the property ``prop`` on the target ``tgt``.
 
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx 
b/Source/cmGeneratorExpressionEvaluator.cxx
index 7e77e4a..0477afb 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1512,6 +1512,7 @@ static const struct InstallPrefixNode : public 
cmGeneratorExpressionNode
 class ArtifactNameTag;
 class ArtifactLinkerTag;
 class ArtifactSonameTag;
+class ArtifactPdbTag;
 
 class ArtifactPathTag;
 class ArtifactDirTag;
@@ -1558,6 +1559,21 @@ struct 
TargetFilesystemArtifactResultCreatorArtifactSonameTag
 
 //
 template
+struct TargetFilesystemArtifactResultCreatorArtifactPdbTag
+{
+  static std::string Create(cmTarget* target,
+cmGeneratorExpressionContext *context,
+const GeneratorExpressionContent *)
+  {
+std::string result = target-GetPDBDirectory(context-Config);
+result += /;
+result += target-GetPDBName(context-Config);
+return result;
+  }
+};
+
+//
+template
 struct TargetFilesystemArtifactResultCreatorArtifactLinkerTag
 {
   static std::string Create(cmTarget* target,
@@ -1702,6 +1718,9 @@ TargetFilesystemArtifactNodeGroupArtifactLinkerTag 
targetLinkerNodeGroup;
 static const
 TargetFilesystemArtifactNodeGroupArtifactSonameTag targetSoNameNodeGroup;
 
+static const
+TargetFilesystemArtifactNodeGroupArtifactPdbTag targetPdbNodeGroup;
+
 //
 static const
 cmGeneratorExpressionNode* GetNode(const std::string identifier)
@@ -1729,12 +1748,15 @@ cmGeneratorExpressionNode* GetNode(const std::string 
identifier)
 nodeMap[TARGET_FILE] = targetNodeGroup.File;
 nodeMap[TARGET_LINKER_FILE] = targetLinkerNodeGroup.File;
 nodeMap[TARGET_SONAME_FILE] = targetSoNameNodeGroup.File;
+nodeMap[TARGET_PDB_FILE] = targetPdbNodeGroup.File;
 nodeMap[TARGET_FILE_NAME] = targetNodeGroup.FileName;
 nodeMap[TARGET_LINKER_FILE_NAME] = targetLinkerNodeGroup.FileName;
 nodeMap[TARGET_SONAME_FILE_NAME] = targetSoNameNodeGroup.FileName;
+nodeMap[TARGET_PDB_FILE_NAME] = targetPdbNodeGroup.FileName;
 nodeMap[TARGET_FILE_DIR] = targetNodeGroup.FileDir;
 nodeMap[TARGET_LINKER_FILE_DIR] = targetLinkerNodeGroup.FileDir;
 nodeMap[TARGET_SONAME_FILE_DIR] = targetSoNameNodeGroup.FileDir;
+nodeMap[TARGET_PDB_FILE_DIR] = targetPdbNodeGroup.FileDir;
 nodeMap[STREQUAL] = strEqualNode;
 nodeMap[EQUAL] = equalNode;
 nodeMap[LOWER_CASE] = lowerCaseNode;

---

Summary of changes:


hooks/post-receive
-- 
CMake

[Cmake-commits] CMake branch, master, updated. v3.0.0-1485-g4d7b937

2014-07-24 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  4d7b9375b0a56a78a6cfa823069cc57e37fe9766 (commit)
  from  afe21fc3c43af0c031a77b3b48041d35f248f481 (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=4d7b9375b0a56a78a6cfa823069cc57e37fe9766
commit 4d7b9375b0a56a78a6cfa823069cc57e37fe9766
Author: Kitware Robot kwro...@kitware.com
AuthorDate: Fri Jul 25 00:01:07 2014 -0400
Commit: Kitware Robot kwro...@kitware.com
CommitDate: Fri Jul 25 00:01:07 2014 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 054cf09..4f38f7d 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 20140724)
+set(CMake_VERSION_PATCH 20140725)
 #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/mailman/listinfo/cmake-commits