[Cmake-commits] CMake branch, next, updated. v3.2.0-842-g7c6a5fe

[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  7c6a5fe2a078438b5850a75a22549f280a16f3e0 (commit)
       via  3f1362b1303554c452f953e5fdae1bb44e55f3c2 (commit)
      from  38305a812e6d79ce60b67130f9b6f5c37e32b39a (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=7c6a5fe2a078438b5850a75a22549f280a16f3e0
commit 7c6a5fe2a078438b5850a75a22549f280a16f3e0
Merge: 38305a8 3f1362b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 5 02:56:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 5 02:56:38 2015 -0500

    Merge topic 'target-language-genex' into next
    
    3f1362b1 Fix VS6 tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f1362b1303554c452f953e5fdae1bb44e55f3c2
commit 3f1362b1303554c452f953e5fdae1bb44e55f3c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 5 08:50:01 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 5 08:54:50 2015 +0100

    Fix VS6 tests.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 1a08dc3..5c43f46 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1779,12 +1779,12 @@ void cmLocalVisualStudio6Generator
     std::set<std::string> minsizeDefinesSet;
     std::set<std::string> debugrelDefinesSet;
 
-    this->AddCompileDefinitions(definesSet, &target, "", "");
-    this->AddCompileDefinitions(debugDefinesSet, &target, "DEBUG", "");
-    this->AddCompileDefinitions(releaseDefinesSet, &target, "RELEASE", "");
-    this->AddCompileDefinitions(minsizeDefinesSet, &target, "MINSIZEREL", "");
+    this->AddCompileDefinitions(definesSet, &target, "", "C");
+    this->AddCompileDefinitions(debugDefinesSet, &target, "DEBUG", "C");
+    this->AddCompileDefinitions(releaseDefinesSet, &target, "RELEASE", "C");
+    this->AddCompileDefinitions(minsizeDefinesSet, &target, "MINSIZEREL", "C");
     this->AddCompileDefinitions(debugrelDefinesSet, &target,
-                                "RELWITHDEBINFO", "");
+                                "RELWITHDEBINFO", "C");
 
     std::string defines = " ";
     std::string debugDefines = " ";
diff --git a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
index 8c4fed2..f96283d 100644
--- a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
@@ -14,7 +14,6 @@ target_compile_definitions(target_compile_definitions
 
 add_executable(consumer
   "${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/consumer.c"
 )
 
 target_compile_definitions(consumer
@@ -28,6 +27,9 @@ target_compile_definitions(consumer
 )
 
 if (CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
+  target_sources(consumer PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}/consumer.c"
+  )
   target_compile_definitions(consumer
     PRIVATE
       CONSUMER_LANG_$<COMPILE_LANGUAGE>
diff --git a/Tests/CMakeCommands/target_compile_options/CMakeLists.txt b/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
index 6ac3ea0..35dd276 100644
--- a/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
@@ -21,10 +21,12 @@ endif()
 
 add_executable(consumer
   "${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/consumer.c"
 )
 
 if (NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+  target_sources(consumer PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}/consumer.c"
+  )
   target_compile_options(consumer
     PRIVATE
       -DCONSUMER_LANG_$<COMPILE_LANGUAGE>
diff --git a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
index cfc74fb..d57556a 100644
--- a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
@@ -43,6 +43,9 @@ add_executable(consumer
 )
 
 if (CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
+  target_sources(consumer PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}/consumer.c"
+  )
   target_include_directories(consumer
     PRIVATE
       $<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/cxx_only>

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx                     |   10 +++++-----
 .../CMakeCommands/target_compile_definitions/CMakeLists.txt  |    4 +++-
 Tests/CMakeCommands/target_compile_options/CMakeLists.txt    |    4 +++-
 .../CMakeCommands/target_include_directories/CMakeLists.txt  |    3 +++
 4 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake