[Cmake-commits] CMake branch, next, updated. v2.8.11-2180-g6f89e1c

[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  6f89e1c4a21e4eeb95d2885527872aa3d2beb0ec (commit)
       via  2c3bbae47d56b96654dced8038a787dfcf80e049 (commit)
      from  95e1612ee1ae0e553f1711e99c05b6f9feff365d (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=6f89e1c4a21e4eeb95d2885527872aa3d2beb0ec
commit 6f89e1c4a21e4eeb95d2885527872aa3d2beb0ec
Merge: 95e1612 2c3bbae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 23 11:00:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 23 11:00:44 2013 -0400

    Merge topic 'language-generator-expressions' into next
    
    2c3bbae Tests/CompileDefinitions: Use unique source file names for VS 6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c3bbae47d56b96654dced8038a787dfcf80e049
commit 2c3bbae47d56b96654dced8038a787dfcf80e049
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 23 10:56:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 23 10:56:44 2013 -0400

    Tests/CompileDefinitions: Use unique source file names for VS 6
    
    Visual Studio 6 does not support multiple source files with the same
    name in the same target even with different language extensions.  Rename
    sources compiletest_mixed.(c|cpp) to compiletest_mixed_(c.c|cxx.cpp) to
    avoid conflict.

diff --git a/Tests/CompileDefinitions/compiletest_mixed.c b/Tests/CompileDefinitions/compiletest_mixed_c.c
similarity index 100%
rename from Tests/CompileDefinitions/compiletest_mixed.c
rename to Tests/CompileDefinitions/compiletest_mixed_c.c
diff --git a/Tests/CompileDefinitions/compiletest_mixed.cpp b/Tests/CompileDefinitions/compiletest_mixed_cxx.cpp
similarity index 100%
rename from Tests/CompileDefinitions/compiletest_mixed.cpp
rename to Tests/CompileDefinitions/compiletest_mixed_cxx.cpp
diff --git a/Tests/CompileDefinitions/target_prop/CMakeLists.txt b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
index 302fc0a..66a3aa6 100644
--- a/Tests/CompileDefinitions/target_prop/CMakeLists.txt
+++ b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
@@ -38,7 +38,7 @@ set_property(TARGET target_prop_c_executable APPEND PROPERTY COMPILE_DEFINITIONS
     )
 
 # Resulting link language will be CXX
-add_executable(target_prop_mixed_executable ../compiletest_mixed.c ../compiletest_mixed.cpp)
+add_executable(target_prop_mixed_executable ../compiletest_mixed_c.c ../compiletest_mixed_cxx.cpp)
 
 set_property(TARGET target_prop_mixed_executable APPEND PROPERTY COMPILE_DEFINITIONS
     "$<$<LINK_LANGUAGE:CXX>:LINK_CXX_DEFINE>"

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

Summary of changes:
 .../{compiletest_mixed.c => compiletest_mixed_c.c} |    0
 ...iletest_mixed.cpp => compiletest_mixed_cxx.cpp} |    0
 .../CompileDefinitions/target_prop/CMakeLists.txt  |    2 +-
 3 files changed, 1 insertions(+), 1 deletions(-)
 rename Tests/CompileDefinitions/{compiletest_mixed.c => compiletest_mixed_c.c} (100%)
 rename Tests/CompileDefinitions/{compiletest_mixed.cpp => compiletest_mixed_cxx.cpp} (100%)


hooks/post-receive
-- 
CMake