[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2977-gc0b5efd

[Brad King]

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  c0b5efd03b3da613028af1b13d25932dc6f3e875 (commit)
       via  a07c73b36a1f0ad3f0d24caa930d28d9c85308be (commit)
      from  26dbc08d707361eafd4dc59cfc4d945e153d3e43 (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=c0b5efd03b3da613028af1b13d25932dc6f3e875
commit c0b5efd03b3da613028af1b13d25932dc6f3e875
Merge: 26dbc08 a07c73b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 17:03:10 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 8 17:03:10 2013 -0400

    Merge topic 'try_compile-escape-flags' into next
    
    a07c73b try_compile: Fix flag escaping on VS 6 and Watcom


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a07c73b36a1f0ad3f0d24caa930d28d9c85308be
commit a07c73b36a1f0ad3f0d24caa930d28d9c85308be
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 17:00:02 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 17:00:31 2013 -0400

    try_compile: Fix flag escaping on VS 6 and Watcom
    
    Fix the TryCompile test's TESTDEF case to use flags that the
    VS 6 IDE and Watcom compiler understand.

diff --git a/Tests/TryCompile/CMakeLists.txt b/Tests/TryCompile/CMakeLists.txt
index a181e3c..7b25e84 100644
--- a/Tests/TryCompile/CMakeLists.txt
+++ b/Tests/TryCompile/CMakeLists.txt
@@ -91,7 +91,13 @@ endif()
 
 # try to compile a file that should compile
 set(_c_flags "${CMAKE_C_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \"-DTESTDEF\"")
+if(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D \"TESTDEF\"")
+elseif(WATCOM)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -dTESTDEF")
+else()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \"-DTESTDEF\"")
+endif()
 try_compile(SHOULD_PASS
     ${TryCompile_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
     ${TryCompile_SOURCE_DIR}/testdef.c

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

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


hooks/post-receive
-- 
CMake