[Cmake-commits] CMake branch, next, updated. v3.4.2-2042-gc7313e7

[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  c7313e73a122667ec905f3c8f265de6da9f709e7 (commit)
       via  81ec5ea6a94a52ca33655e9db4598258fc627762 (commit)
       via  f372d6eae582b0992c231696d7ac23b5a2632e4b (commit)
      from  f110ba38bdf00a778c0388da5886f024ce078f47 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7313e73a122667ec905f3c8f265de6da9f709e7
commit c7313e73a122667ec905f3c8f265de6da9f709e7
Merge: f110ba3 81ec5ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 20 08:36:56 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 20 08:36:56 2016 -0500

    Merge topic 'ExternalProject-ctest-config' into next
    
    81ec5ea6 fixup! ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators
    f372d6ea fixup! ExternalProject: Simplify `cmake --build` configuration passing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ec5ea6a94a52ca33655e9db4598258fc627762
commit 81ec5ea6a94a52ca33655e9db4598258fc627762
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 20 08:35:30 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 20 08:35:30 2016 -0500

    fixup! ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index ae93d56..7070dc4 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1241,7 +1241,7 @@ function(_ep_get_build_command name step cmd_var)
           string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}")
           set(args "")
           if(CMAKE_CONFIGURATION_TYPES)
-            list(APPEND args -C $<CONFIGURATION>)
+            list(APPEND args -C $<CONFIG>)
           endif()
         endif()
       endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f372d6eae582b0992c231696d7ac23b5a2632e4b
commit f372d6eae582b0992c231696d7ac23b5a2632e4b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 20 08:35:15 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 20 08:35:15 2016 -0500

    fixup! ExternalProject: Simplify `cmake --build` configuration passing

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 200c488..ae93d56 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1231,7 +1231,7 @@ function(_ep_get_build_command name step cmd_var)
         endif()
         set(args --build ".")
         if(CMAKE_CONFIGURATION_TYPES)
-          list(APPEND args --config $<CONFIGURATION>)
+          list(APPEND args --config $<CONFIG>)
         endif()
         if(step STREQUAL "INSTALL")
           list(APPEND args --target install)

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

Summary of changes:
 Modules/ExternalProject.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake