[Cmake-commits] CMake branch, next, updated. v2.8.4-1681-g427526a

[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  427526a6dbb20c4c6b46b8db7aedfa1716726278 (commit)
       via  27aa446352b882c7bbda269a3770fec8fa24eb57 (commit)
      from  37d2b96f32e82497aa6bca0b6bbffe77987844f0 (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=427526a6dbb20c4c6b46b8db7aedfa1716726278
commit 427526a6dbb20c4c6b46b8db7aedfa1716726278
Merge: 37d2b96 27aa446
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 3 16:17:29 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 3 16:17:29 2011 -0400

    Merge topic 'vs10_include_fix' into next
    
    27aa446 One more try.  Use full path by default, and relative on broken compilers.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27aa446352b882c7bbda269a3770fec8fa24eb57
commit 27aa446352b882c7bbda269a3770fec8fa24eb57
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 3 16:16:50 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jun 3 16:16:50 2011 -0400

    One more try.  Use full path by default, and relative on broken compilers.

diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 87b4a95..60b8c22 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -14,10 +14,34 @@ file(WRITE ${CMAKE_BINARY_DIR}/TarProp/TarProp.h
 "//TarProp.h
 ")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -IFlags")
+# default to testing with full path
+# some compilers can not handle the escape for directories
+# with spaces in them.
+set(USE_FULLPATH TRUE)
+if(WATCOM OR MSVC60)
+  set(USE_FULLPATH FALSE)
+endif()
+if(USE_FULLPATH)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \"-I${CMAKE_BINARY_DIR}/Flags\"")
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -IFlags")
+endif()
+
 include_directories(${CMAKE_BINARY_DIR}/IncDir)
-set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
-  "-ISrcProp")
+if(USE_FULLPATH)
+  set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
+    "\"-I${CMAKE_BINARY_DIR}/SrcProp\"")
+else()
+  set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
+    "-ISrcProp")
+endif()
+
 add_executable(IncludeDirectories main.cpp)
-set_target_properties(IncludeDirectories
-  PROPERTIES COMPILE_FLAGS "-ITarProp")
+
+if(USE_FULLPATH)
+  set_target_properties(IncludeDirectories
+    PROPERTIES COMPILE_FLAGS "\"-I${CMAKE_BINARY_DIR}/TarProp\"")
+else()
+  set_target_properties(IncludeDirectories
+    PROPERTIES COMPILE_FLAGS "-ITarProp")
+endif()

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

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


hooks/post-receive
-- 
CMake