[Cmake-commits] CMake branch, next, updated. v3.2.1-1243-gf195280

[Ben Boeckel]

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  f19528014b75129c08d5749239c86b2ceabaa6b7 (commit)
       via  a704098de83460e8e9bae02434a6c31e7fc3ffd7 (commit)
      from  a7fe79c03a8036edbb998809bd339cce2a0ac3f8 (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=f19528014b75129c08d5749239c86b2ceabaa6b7
commit f19528014b75129c08d5749239c86b2ceabaa6b7
Merge: a7fe79c a704098
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 26 18:14:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 26 18:14:02 2015 -0400

    Merge topic 'fix-external-project-generator' into next
    
    a704098d ExternalProject: fix the build command for generator overrides


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a704098de83460e8e9bae02434a6c31e7fc3ffd7
commit a704098de83460e8e9bae02434a6c31e7fc3ffd7
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 26 18:12:04 2015 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 26 18:12:04 2015 -0400

    ExternalProject: fix the build command for generator overrides
    
    The `binary_dir` variable is never set, so this is invalid. Instead, use
    "." which all the other build commands use anyways. Also only set the
    --config option if it is meaningful.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d7b985d..0c73d41 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1197,7 +1197,10 @@ function(_ep_get_build_command name step cmd_var)
         else()
           set(cmd "${CMAKE_COMMAND}")
         endif()
-        set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR})
+        set(args --build ".")
+        if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
+          list(APPEND args --config "${CMAKE_CFG_INTDIR}")
+        endif ()
         if(step STREQUAL "INSTALL")
           list(APPEND args --target install)
         endif()

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

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


hooks/post-receive
-- 
CMake