[Cmake-commits] CMake branch, next, updated. v2.8.3-1476-gd8f414e

[David Cole]

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  d8f414e9d6add79c71eab1450a9a8610dfc8a071 (commit)
       via  8f9919d93cad64de58775e4a7609b0ffb37d061e (commit)
       via  78fe97f2ff4dbe66590ee79a342ac01a5566ef31 (commit)
      from  803a7cb19950ea307568294e324ad73646026cfa (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=d8f414e9d6add79c71eab1450a9a8610dfc8a071
commit d8f414e9d6add79c71eab1450a9a8610dfc8a071
Merge: 803a7cb 8f9919d
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jan 26 08:37:29 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 26 08:37:29 2011 -0500

    Merge topic 'fix-11695-spaces-in-vs10-rc-defs' into next
    
    8f9919d Avoid space in rc /D values for VS6 and Cygwin (#11695)
    78fe97f Fix line too long KWStyle issue (#11695)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f9919d93cad64de58775e4a7609b0ffb37d061e
commit 8f9919d93cad64de58775e4a7609b0ffb37d061e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jan 26 08:26:31 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Jan 26 08:26:31 2011 -0500

    Avoid space in rc /D values for VS6 and Cygwin (#11695)
    
    Change to the test only. Using a space in an rc /D value will
    not work at present with VS6 or Cygwin rc compilers.

diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
index 8c14f8d..5fbd572 100644
--- a/Tests/VSResource/CMakeLists.txt
+++ b/Tests/VSResource/CMakeLists.txt
@@ -1,13 +1,18 @@
 cmake_minimum_required(VERSION 2.8.3.20110118)
-project (VSResource)
+project(VSResource)
 
 string(REPLACE "/INCREMENTAL:YES" ""
   CMAKE_EXE_LINKER_FLAGS_DEBUG
   "${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test.txt
-  "${CMAKE_CURRENT_BINARY_DIR}/test with spaces.txt" COPYONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_definitions(/DCMAKE_RCDEFINE="test with spaces.txt")
+if(MSVC60 OR CYGWIN)
+  # VS6 and Cygwin rc compilers do not deal well with spaces in a "/D" value
+  add_definitions(/DCMAKE_RCDEFINE="test.txt")
+else()
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test.txt
+    "${CMAKE_CURRENT_BINARY_DIR}/test with spaces.txt" COPYONLY)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
+  add_definitions(/DCMAKE_RCDEFINE="test with spaces.txt")
+endif()
 
 add_executable(VSResource main.cpp test.rc)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78fe97f2ff4dbe66590ee79a342ac01a5566ef31
commit 78fe97f2ff4dbe66590ee79a342ac01a5566ef31
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jan 26 08:25:25 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Jan 26 08:25:25 2011 -0500

    Fix line too long KWStyle issue (#11695)

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 7d36153..d880ace 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1522,7 +1522,8 @@ void cmLocalVisualStudio7Generator
             fileOptions.OutputAdditionalOptions(fout, "\t\t\t\t\t", "\n");
             fileOptions.OutputFlagMap(fout, "\t\t\t\t\t");
             fileOptions.OutputPreprocessorDefinitions(fout,
-                                                      "\t\t\t\t\t", "\n", lang);
+                                                      "\t\t\t\t\t", "\n",
+                                                      lang);
             }
           if(!fc.AdditionalDeps.empty())
             {

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    3 ++-
 Tests/VSResource/CMakeLists.txt          |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake