[Cmake-commits] CMake branch, next, updated. v2.8.12-4479-gb48afda
Stephen Kelly
steveire at gmail.com
Fri Oct 25 01:01:23 EDT 2013
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 b48afdac1b4b512967295302aff10af37db3d8ac (commit)
via 02cf77f7122bfc1c815fa27d42302cd90d028650 (commit)
via fd818b2ff497dbe382684f59eb626956e6e79aaa (commit)
from e4e57fa9339ff3453cf399f97b2d12ac25f7e44b (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=b48afdac1b4b512967295302aff10af37db3d8ac
commit b48afdac1b4b512967295302aff10af37db3d8ac
Merge: e4e57fa 02cf77f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 25 01:01:18 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 01:01:18 2013 -0400
Merge topic 'QNX-ninja-generator' into next
02cf77f QNX: Don't attempt to create depfiles
fd818b2 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02cf77f7122bfc1c815fa27d42302cd90d028650
commit 02cf77f7122bfc1c815fa27d42302cd90d028650
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 21 09:59:23 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 25 07:00:38 2013 +0200
QNX: Don't attempt to create depfiles
The qcc driver can not handle the flags. This makes it possible to use
qcc with the Ninja generator.
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index 2598411..068799f 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -3,6 +3,9 @@ set(QNXNTO 1)
# The QNX GCC does not seem to have -isystem so remove the flag.
set(CMAKE_INCLUDE_SYSTEM_FLAG_C)
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
+# ... Nor does the driver support appropriate flags to create depfiles.
+set(CMAKE_DEPFILE_FLAGS_C)
+set(CMAKE_DEPFILE_FLAGS_CXX)
set(CMAKE_DL_LIBS "")
set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/QNX.cmake | 3 +++
Source/CMakeVersion.cmake | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list