[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-654-g04fe52c

[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  04fe52caa011df0276ada5eab6e169a65e103f79 (commit)
       via  69e3988fa81203c219d0ddb8f34e4ab150e53b0c (commit)
      from  8b4de518cd3aae71784d8887222b9282ecbdcff8 (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=04fe52caa011df0276ada5eab6e169a65e103f79
commit 04fe52caa011df0276ada5eab6e169a65e103f79
Merge: 8b4de51 69e3988
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 15 12:44:45 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 15 12:44:45 2014 -0500

    Merge topic 'custom-command-byproducts' into next
    
    69e3988f Tests/CustomCommandByproducts: Use normalized external lib path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69e3988fa81203c219d0ddb8f34e4ab150e53b0c
commit 69e3988fa81203c219d0ddb8f34e4ab150e53b0c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 15 12:43:35 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 15 12:43:35 2014 -0500

    Tests/CustomCommandByproducts: Use normalized external lib path

diff --git a/Tests/CustomCommandByproducts/CMakeLists.txt b/Tests/CustomCommandByproducts/CMakeLists.txt
index c645839..884f8c2 100644
--- a/Tests/CustomCommandByproducts/CMakeLists.txt
+++ b/Tests/CustomCommandByproducts/CMakeLists.txt
@@ -81,8 +81,13 @@ add_custom_command(OUTPUT timestamp8.txt
 
 # Generate the library file of an imported target as a byproduct
 # of an external project.
+if(CMAKE_CONFIGURATION_TYPES)
+  set(cfg /${CMAKE_CFG_INTDIR})
+else()
+  set(cfg)
+endif()
 set(ExternalLibrary_LIBRARY
-  ${CMAKE_CURRENT_BINARY_DIR}/External-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}ExternalLibrary${CMAKE_STATIC_LIBRARY_SUFFIX}
+  ${CMAKE_CURRENT_BINARY_DIR}/External-build${cfg}/${CMAKE_STATIC_LIBRARY_PREFIX}ExternalLibrary${CMAKE_STATIC_LIBRARY_SUFFIX}
   )
 include(ExternalProject)
 ExternalProject_Add(ExternalTarget

-----------------------------------------------------------------------

Summary of changes:
 Tests/CustomCommandByproducts/CMakeLists.txt |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake