[Cmake-commits] CMake branch, next, updated. v2.8.4-1679-g37d2b96

[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  37d2b96f32e82497aa6bca0b6bbffe77987844f0 (commit)
       via  2dfc121b898dcd04b3fe8ecb18d1ad8d9c4b945a (commit)
      from  385cc3bde7376b8696b374ae1ccb0526a57650db (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=37d2b96f32e82497aa6bca0b6bbffe77987844f0
commit 37d2b96f32e82497aa6bca0b6bbffe77987844f0
Merge: 385cc3b 2dfc121
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 3 15:07:10 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 3 15:07:10 2011 -0400

    Merge topic 'vs10_include_fix' into next
    
    2dfc121 Use bin tree for inclues to avoid -I with spaces in the path.


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

    Use bin tree for inclues to avoid -I with spaces in the path.

diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 8bc0f6c..87b4a95 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -1,10 +1,23 @@
 cmake_minimum_required (VERSION 2.6)
 project(IncludeDirectories)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \"-I${CMAKE_SOURCE_DIR}/Flags\"")
-include_directories(${CMAKE_SOURCE_DIR}/IncDir)
+file(WRITE ${CMAKE_BINARY_DIR}/Flags/Flags.h
+"//Flags.h
+")
+file(WRITE ${CMAKE_BINARY_DIR}/IncDir/IncDir.h
+"//IncDir.h
+")
+file(WRITE ${CMAKE_BINARY_DIR}/SrcProp/SrcProp.h
+"//SrcProp.h
+")
+file(WRITE ${CMAKE_BINARY_DIR}/TarProp/TarProp.h
+"//TarProp.h
+")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -IFlags")
+include_directories(${CMAKE_BINARY_DIR}/IncDir)
 set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
-  "\"-I${CMAKE_SOURCE_DIR}/SrcProp\"")
+  "-ISrcProp")
 add_executable(IncludeDirectories main.cpp)
 set_target_properties(IncludeDirectories
-  PROPERTIES COMPILE_FLAGS "\"-I${CMAKE_SOURCE_DIR}/TarProp\"")
+  PROPERTIES COMPILE_FLAGS "-ITarProp")
diff --git a/Tests/IncludeDirectories/Flags/Flags.h b/Tests/IncludeDirectories/Flags/Flags.h
deleted file mode 100644
index 0397515..0000000
--- a/Tests/IncludeDirectories/Flags/Flags.h
+++ /dev/null
@@ -1 +0,0 @@
-// include Flags.h
diff --git a/Tests/IncludeDirectories/IncDir/IncDir.h b/Tests/IncludeDirectories/IncDir/IncDir.h
deleted file mode 100644
index 7c0ca96..0000000
--- a/Tests/IncludeDirectories/IncDir/IncDir.h
+++ /dev/null
@@ -1 +0,0 @@
-// include IncDir.h
diff --git a/Tests/IncludeDirectories/SrcProp/SrcProp.h b/Tests/IncludeDirectories/SrcProp/SrcProp.h
deleted file mode 100644
index 18b42cc..0000000
--- a/Tests/IncludeDirectories/SrcProp/SrcProp.h
+++ /dev/null
@@ -1 +0,0 @@
-// include SrcProp.h
diff --git a/Tests/IncludeDirectories/TarProp/TarProp.h b/Tests/IncludeDirectories/TarProp/TarProp.h
deleted file mode 100644
index 59326f6..0000000
--- a/Tests/IncludeDirectories/TarProp/TarProp.h
+++ /dev/null
@@ -1 +0,0 @@
-// include TarProp.h

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

Summary of changes:
 Tests/IncludeDirectories/CMakeLists.txt    |   21 +++++++++++++++++----
 Tests/IncludeDirectories/Flags/Flags.h     |    1 -
 Tests/IncludeDirectories/IncDir/IncDir.h   |    1 -
 Tests/IncludeDirectories/SrcProp/SrcProp.h |    1 -
 Tests/IncludeDirectories/TarProp/TarProp.h |    1 -
 5 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 Tests/IncludeDirectories/Flags/Flags.h
 delete mode 100644 Tests/IncludeDirectories/IncDir/IncDir.h
 delete mode 100644 Tests/IncludeDirectories/SrcProp/SrcProp.h
 delete mode 100644 Tests/IncludeDirectories/TarProp/TarProp.h


hooks/post-receive
-- 
CMake