[Cmake-commits] CMake branch, next, updated. v3.4.2-2028-gd1a35c5

[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  d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec (commit)
       via  f565f9fa038d57958a4d34a6829d3ae175063704 (commit)
       via  b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6 (commit)
      from  bde6c5547e181b72aaefbaffff092bdd9a79ba01 (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=d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec
commit d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec
Merge: bde6c55 f565f9f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 19 16:17:03 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 19 16:17:03 2016 -0500

    Merge topic 'ExternalProject-ctest-config' into next
    
    f565f9fa ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators
    b95be1cf ExternalProject: Simplify `cmake --build` configuration passing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f565f9fa038d57958a4d34a6829d3ae175063704
commit f565f9fa038d57958a4d34a6829d3ae175063704
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 19 16:09:29 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 19 16:09:29 2016 -0500

    ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators
    
    In multi-config generators we must tell `ctest` what configuration to
    test.
    
    Reported-by: Taylor Braun-Jones <taylor at braun-jones.org>

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f8ed0c8..200c488 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1240,6 +1240,9 @@ function(_ep_get_build_command name step cmd_var)
         if("x${step}x" STREQUAL "xTESTx")
           string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}")
           set(args "")
+          if(CMAKE_CONFIGURATION_TYPES)
+            list(APPEND args -C $<CONFIGURATION>)
+          endif()
         endif()
       endif()
     else()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6
commit b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 19 16:07:28 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 19 16:09:23 2016 -0500

    ExternalProject: Simplify `cmake --build` configuration passing
    
    Check CMAKE_CONFIGURATION_TYPES instead of CMAKE_CFG_INTDIR in order
    to recognize multi-config generators.  Then use $<CONFIGURATION> to
    pass the configuration value.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 5c5c54a..f8ed0c8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1230,9 +1230,9 @@ function(_ep_get_build_command name step cmd_var)
           set(cmd "${CMAKE_COMMAND}")
         endif()
         set(args --build ".")
-        if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
-          list(APPEND args --config "${CMAKE_CFG_INTDIR}")
-        endif ()
+        if(CMAKE_CONFIGURATION_TYPES)
+          list(APPEND args --config $<CONFIGURATION>)
+        endif()
         if(step STREQUAL "INSTALL")
           list(APPEND args --target install)
         endif()

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

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


hooks/post-receive
-- 
CMake