[Cmake-commits] CMake branch, next, updated. v2.8.5-1697-gda375ff

[Stephen Kelly]

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  da375ffe563a89e295b50f01342d4631af6a1470 (commit)
       via  99b2aabd460d0c508ffa7b21283a0512e322e717 (commit)
       via  7ac0ab1f88b66d162a89d055517551b3b7ecd8a6 (commit)
       via  89108b99eca60cfa71cee9727f3af052f5b9da4c (commit)
      from  5d4ef7edbda771f86a63a2c02816bd811b870aff (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=da375ffe563a89e295b50f01342d4631af6a1470
commit da375ffe563a89e295b50f01342d4631af6a1470
Merge: 5d4ef7e 99b2aab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 14:00:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 14:00:34 2011 -0400

    Merge topic 'generate_export_header' into next
    
    99b2aab Disable the tests for Watcom.
    7ac0ab1 Quote paths in case there is a space in one of them.
    89108b9 Look for errors reported by PGI too.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99b2aabd460d0c508ffa7b21283a0512e322e717
commit 99b2aabd460d0c508ffa7b21283a0512e322e717
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 19:58:00 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 24 19:58:00 2011 +0200

    Disable the tests for Watcom.
    
    They are timing out and showing up on the dashboard.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 9141471..5372f92 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -2,6 +2,21 @@ cmake_minimum_required(VERSION 2.8.5 FATAL_ERROR)
 
 project(GenerateExportHeader)
 
+# Prevent timeout on Watcom by not running the tests.
+if ("${CMAKE_COMPILER_ID}" MATCHES Watcom)
+  file(WRITE
+    "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
+    "int main() { return 0; }
+  "
+  )
+
+  add_executable(
+    GenerateExportHeader
+    "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
+  )
+  return()
+endif()
+
 include(CheckCXXCompilerFlag)
 
 set( CMAKE_INCLUDE_CURRENT_DIR ON )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ac0ab1f88b66d162a89d055517551b3b7ecd8a6
commit 7ac0ab1f88b66d162a89d055517551b3b7ecd8a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 19:50:31 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 24 19:50:31 2011 +0200

    Quote paths in case there is a space in one of them.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index dc72689..9141471 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -65,7 +65,7 @@ macro(_do_build Include Library LibrarySource Source)
 
     "set(CMAKE_INCLUDE_CURRENT_DIR ON)\n"
 
-    "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \${CMAKE_CURRENT_BINARY_DIR})\n"
+    "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"\${CMAKE_CURRENT_BINARY_DIR}\")\n"
 
     "include(GenerateExportHeader)\n"
 
@@ -79,9 +79,9 @@ macro(_do_build Include Library LibrarySource Source)
     "  add_definitions(-DCOMPILER_IS_MSVC)\n"
     "endif()\n"
 
-    "add_subdirectory(${LibrarySource})\n"
+    "add_subdirectory(\"${LibrarySource}\")\n"
 
-    "include_directories(${LibrarySource} \${CMAKE_CURRENT_BINARY_DIR}/${LibrarySource})\n"
+    "include_directories(\"${LibrarySource}\" \"\${CMAKE_CURRENT_BINARY_DIR}/${LibrarySource}\")\n"
 
     "${CONDITIONAL_STATIC_DEFINE}"
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89108b99eca60cfa71cee9727f3af052f5b9da4c
commit 89108b99eca60cfa71cee9727f3af052f5b9da4c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 19:43:04 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 24 19:43:04 2011 +0200

    Look for errors reported by PGI too.

diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index 91008c3..7785148 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -34,6 +34,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL
      FAIL_REGEX "not supported in this configuration; ignored"       # AIX
+     FAIL_REGEX "File with unknown suffix passed to linker" # PGI
      )
    SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
 ENDMACRO (CHECK_CXX_COMPILER_FLAG)

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

Summary of changes:
 Modules/CheckCXXCompilerFlag.cmake               |    1 +
 Tests/Module/GenerateExportHeader/CMakeLists.txt |   21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake