[Cmake-commits] CMake branch, next, updated. v2.8.4-1677-g385cc3b

[Bill Hoffman]

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  385cc3bde7376b8696b374ae1ccb0526a57650db (commit)
       via  6d29b4bfe6cffae306f0d74f1cbd3696db56d98b (commit)
      from  b31dab8b649f135296e9bc284bd93d009961deff (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=385cc3bde7376b8696b374ae1ccb0526a57650db
commit 385cc3bde7376b8696b374ae1ccb0526a57650db
Merge: b31dab8 6d29b4b
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 3 13:00:50 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 3 13:00:50 2011 -0400

    Merge topic 'vs10_include_fix' into next
    
    6d29b4b Append and do not clobber CMAKE_CXX_FLAGS in the test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d29b4bfe6cffae306f0d74f1cbd3696db56d98b
commit 6d29b4bfe6cffae306f0d74f1cbd3696db56d98b
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 3 13:00:05 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jun 3 13:00:05 2011 -0400

    Append and do not clobber CMAKE_CXX_FLAGS in the test.

diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index af2a2b7..8bc0f6c 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project(IncludeDirectories)
 
-set(CMAKE_CXX_FLAGS "\"-I${CMAKE_SOURCE_DIR}/Flags\"")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \"-I${CMAKE_SOURCE_DIR}/Flags\"")
 include_directories(${CMAKE_SOURCE_DIR}/IncDir)
 set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
   "\"-I${CMAKE_SOURCE_DIR}/SrcProp\"")

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

Summary of changes:
 Tests/IncludeDirectories/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake