[Cmake-commits] CMake branch, next, updated. v2.8.3-612-g2adf433

[Marcus D. Hanwell]

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  2adf43362641b98c82bdd7c1a057f03e84d5125f (commit)
       via  74e49aa441e4805b40b5e61348501f9143a5defe (commit)
      from  fc13fef3ab99fef90a16a3d7fdc8ced9c0ac61d2 (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=2adf43362641b98c82bdd7c1a057f03e84d5125f
commit 2adf43362641b98c82bdd7c1a057f03e84d5125f
Merge: fc13fef 74e49aa
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Sat Nov 13 09:04:36 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 13 09:04:36 2010 -0500

    Merge topic 'EP-extra-generator' into next
    
    74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74e49aa441e4805b40b5e61348501f9143a5defe
commit 74e49aa441e4805b40b5e61348501f9143a5defe
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Fri Nov 12 19:43:05 2010 -0500
Commit:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
CommitDate: Fri Nov 12 19:43:05 2010 -0500

    BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
    
    This patch fixes the behavior of external projects with respect to
    generators using the CMAKE_EXTRA_GENERATOR variable.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 997164a..1be6cfd 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1228,7 +1228,12 @@ function(_ep_add_configure_command name)
     if(cmake_generator)
       list(APPEND cmd "-G${cmake_generator}" "${source_dir}")
     else()
-      list(APPEND cmd "-G${CMAKE_GENERATOR}" "${source_dir}")
+      if(CMAKE_EXTRA_GENERATOR)
+        list(APPEND cmd "-G${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}"
+          "${source_dir}")
+      else()
+        list(APPEND cmd "-G${CMAKE_GENERATOR}" "${source_dir}")
+      endif()
     endif()
   endif()
 

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

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


hooks/post-receive
-- 
CMake