[Cmake-commits] CMake branch, next, updated. v2.8.9-220-g678c2c3

[Stephen Kelly]

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  678c2c3c372795a8fa08986d0653db6b57712ec0 (commit)
       via  f0a1065393a57f503bc2c86f432f50dd4b8d5bbd (commit)
      from  436669410b23a9c344f67b44e633e3225d1e8d9e (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=678c2c3c372795a8fa08986d0653db6b57712ec0
commit 678c2c3c372795a8fa08986d0653db6b57712ec0
Merge: 4366694 f0a1065
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 22 07:07:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 22 07:07:23 2012 -0400

    Merge topic 'compile-definitions-unique' into next
    
    f0a1065 Rename files from main.cpp to more meaningful names.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0a1065393a57f503bc2c86f432f50dd4b8d5bbd
commit f0a1065393a57f503bc2c86f432f50dd4b8d5bbd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 22 13:03:56 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 22 13:05:07 2012 +0200

    Rename files from main.cpp to more meaningful names.
    
    Because the main file for the dummy-executable and the actual compile
    test were both called main.cpp, they were overwriting each other during
    in-source builds.

diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 337aeb1..e7d91bf 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -11,6 +11,6 @@ add_subdirectory(add_definitions_command)
 add_subdirectory(target_prop)
 add_subdirectory(add_definitions_command_with_target_prop)
 
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp" "int main(int, char **) { return 0; }\n")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummyexecutable.cpp" "int main(int, char **) { return 0; }\n")
 
-add_executable(CompileDefinitions "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
+add_executable(CompileDefinitions "${CMAKE_CURRENT_BINARY_DIR}/dummyexecutable.cpp")
diff --git a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt b/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
index 4ca269d..a6372af 100644
--- a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
+++ b/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
@@ -4,4 +4,4 @@ project(add_definitions_command)
 add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_="Fun" -DCMAKE_IS_REALLY="Very Fun")
 add_definitions(-DCMAKE_IS_="Fun" -DCMAKE_IS_REALLY="Very Fun" -DCMAKE_IS_FUN -DCMAKE_IS=Fun)
 
-add_executable(add_definitions_command_executable ../main.cpp)
+add_executable(add_definitions_command_executable ../compiletest.cpp)
diff --git a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
index 4161ed6..e415390 100644
--- a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
+++ b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
@@ -3,7 +3,7 @@ project(add_definitions_command_with_target_prop)
 
 add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun)
 
-add_executable(add_definitions_command_with_target_prop_executable ../main.cpp)
+add_executable(add_definitions_command_with_target_prop_executable ../compiletest.cpp)
 
 set_target_properties(add_definitions_command_with_target_prop_executable PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_="Fun")
 
diff --git a/Tests/CompileDefinitions/main.cpp b/Tests/CompileDefinitions/compiletest.cpp
similarity index 100%
rename from Tests/CompileDefinitions/main.cpp
rename to Tests/CompileDefinitions/compiletest.cpp
diff --git a/Tests/CompileDefinitions/target_prop/CMakeLists.txt b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
index 6dbee9a..e2b6ba9 100644
--- a/Tests/CompileDefinitions/target_prop/CMakeLists.txt
+++ b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 project(target_prop)
 
-add_executable(target_prop_executable ../main.cpp)
+add_executable(target_prop_executable ../compiletest.cpp)
 
 set_target_properties(target_prop_executable PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_FUN)
 

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

Summary of changes:
 Tests/CompileDefinitions/CMakeLists.txt            |    4 ++--
 .../add_definitions_command/CMakeLists.txt         |    2 +-
 .../CMakeLists.txt                                 |    2 +-
 .../{main.cpp => compiletest.cpp}                  |    0
 .../CompileDefinitions/target_prop/CMakeLists.txt  |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename Tests/CompileDefinitions/{main.cpp => compiletest.cpp} (100%)


hooks/post-receive
-- 
CMake