[Cmake-commits] CMake branch, next, updated. v3.4.2-2045-g6c1b1d9

[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  6c1b1d9c251ddd98093e37dfe1c9d605ba0ebe00 (commit)
       via  ec00e89e83eeb91633affd662870b7a6955dbf5a (commit)
       via  5d739a3c843c95aec6c5c8df4d7e87e606c0c8ea (commit)
      from  c7313e73a122667ec905f3c8f265de6da9f709e7 (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=6c1b1d9c251ddd98093e37dfe1c9d605ba0ebe00
commit 6c1b1d9c251ddd98093e37dfe1c9d605ba0ebe00
Merge: c7313e7 ec00e89
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 20 08:37:33 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 20 08:37:33 2016 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec00e89e83eeb91633affd662870b7a6955dbf5a
commit ec00e89e83eeb91633affd662870b7a6955dbf5a
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: Wed Jan 20 08:36:30 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 085aa0d..7070dc4 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 $<CONFIG>)
+          endif()
         endif()
       endif()
     else()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d739a3c843c95aec6c5c8df4d7e87e606c0c8ea
commit 5d739a3c843c95aec6c5c8df4d7e87e606c0c8ea
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: Wed Jan 20 08:36:09 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 $<CONFIG> to pass
    the configuration value.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 5c5c54a..085aa0d 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 $<CONFIG>)
+        endif()
         if(step STREQUAL "INSTALL")
           list(APPEND args --target install)
         endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake