[Cmake-commits] CMake branch, next, updated. v2.8.3-1442-g2418073

[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  2418073e0f591d445d564537246f55ffa5641172 (commit)
       via  5792d3a38a67c8e3fffa7e2743a106a87ff7096c (commit)
      from  52a78520f853c6f2ffee2c41bc2d7bfb05fd54fe (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=2418073e0f591d445d564537246f55ffa5641172
commit 2418073e0f591d445d564537246f55ffa5641172
Merge: 52a7852 5792d3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 20 08:15:33 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 20 08:15:33 2011 -0500

    Merge topic 'outdir-CMAKE_USER_MAKE_RULES_OVERRIDE' into next
    
    5792d3a Always place try_compile executables predictably (#11724)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5792d3a38a67c8e3fffa7e2743a106a87ff7096c
commit 5792d3a38a67c8e3fffa7e2743a106a87ff7096c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 20 08:08:47 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 20 08:08:47 2011 -0500

    Always place try_compile executables predictably (#11724)
    
    Set CMAKE_RUNTIME_OUTPUT_DIRECTORY explicitly in try_compile projects so
    that the COPY_FILE feature knows where to look.  This makes the feature
    robust against CMAKE_USER_MAKE_RULES_OVERRIDE files that set variables
    like CMAKE_RUNTIME_OUTPUT_DIRECTORY or EXECUTABLE_OUTPUT_PATH.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index fcec3e9..1a46df0 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -277,6 +277,10 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
       cmakeFlags.push_back(flag);
       }
 
+    /* Put the executable at a known location (for COPY_FILE).  */
+    fprintf(fout, "SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n",
+            this->BinaryDirectory.c_str());
+    /* Create the actual executable.  */
     fprintf(fout, "ADD_EXECUTABLE(cmTryCompileExec \"%s\")\n",source.c_str());
     fprintf(fout, 
             "TARGET_LINK_LIBRARIES(cmTryCompileExec ${LINK_LIBRARIES})\n");

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

Summary of changes:
 Source/cmCoreTryCompile.cxx |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake