[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-43-gb3df88b

[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  b3df88b4bb4c77291040e27ece6d384e3e58b55c (commit)
       via  6d191f28a379162e39c4acea3bda494936d8c9fe (commit)
      from  3748be6afa12f0f0d7d3b51ee44d7908e86a19bd (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=b3df88b4bb4c77291040e27ece6d384e3e58b55c
commit b3df88b4bb4c77291040e27ece6d384e3e58b55c
Merge: 3748be6 6d191f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 5 14:43:11 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 5 14:43:11 2016 -0500

    Merge topic 'ExternalProject-build-config-compat' into next
    
    6d191f28 fixup! ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d191f28a379162e39c4acea3bda494936d8c9fe
commit 6d191f28a379162e39c4acea3bda494936d8c9fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 5 14:40:58 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 5 14:40:58 2016 -0500

    fixup! ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 8b5e90f..249658d 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1241,6 +1241,8 @@ function(_ep_get_build_command name step cmd_var)
             # BUILD_COMMAND to change the default command instead, but for
             # compatibility honor the value.
             set(config ${CMAKE_CFG_INTDIR})
+            message(AUTHOR_WARNING "CMAKE_CFG_INTDIR should not be set by project code.\n"
+              "To get a non-default build command, use the BUILD_COMMAND option.")
           else()
             set(config $<CONFIG>)
           endif()

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

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


hooks/post-receive
-- 
CMake