[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2768-g8793ba0
Stephen Kelly
steveire at gmail.com
Sun Apr 14 03:05:41 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 8793ba09d75e99ff9f7760eb3a504896fdc4a4d1 (commit)
via 8e0da4cddc1d96012007e1e0215ffda841e03c6b (commit)
via ee62ac4f1a3b79a62f4f1887c8e384f78164a455 (commit)
via edd90f9911bc543871463425f76e38e710ceb276 (commit)
via 1513dd399cd0efb16a8ae28dd198a6f9f0f14dce (commit)
from 3c811404a4f8410960a08c6f29aab049c7341248 (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=8793ba09d75e99ff9f7760eb3a504896fdc4a4d1
commit 8793ba09d75e99ff9f7760eb3a504896fdc4a4d1
Merge: 3c81140 8e0da4c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 14 03:05:40 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 14 03:05:40 2013 -0400
Merge topic 'fix-comment-typos' into next
8e0da4c Fix some copyastos in the DetermineRCCompiler file.
ee62ac4 CMake Nightly Date Stamp
edd90f9 CMake Nightly Date Stamp
1513dd3 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e0da4cddc1d96012007e1e0215ffda841e03c6b
commit 8e0da4cddc1d96012007e1e0215ffda841e03c6b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 14 01:00:19 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 14 09:03:48 2013 +0200
Fix some copyastos in the DetermineRCCompiler file.
diff --git a/Modules/CMakeDetermineRCCompiler.cmake b/Modules/CMakeDetermineRCCompiler.cmake
index fa78da0..c4600c7 100644
--- a/Modules/CMakeDetermineRCCompiler.cmake
+++ b/Modules/CMakeDetermineRCCompiler.cmake
@@ -12,14 +12,14 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-# determine the compiler to use for C programs
-# NOTE, a generator may set CMAKE_C_COMPILER before
+# determine the compiler to use for RC programs
+# NOTE, a generator may set CMAKE_RC_COMPILER before
# loading this file to force a compiler.
-# use environment variable CCC first if defined by user, next use
-# the cmake variable CMAKE_GENERATOR_CC which can be defined by a generator
+# use environment variable RC first if defined by user, next use
+# the cmake variable CMAKE_GENERATOR_RC which can be defined by a generator
# as a default compiler
if(NOT CMAKE_RC_COMPILER)
- # prefer the environment variable CC
+ # prefer the environment variable RC
if($ENV{RC} MATCHES ".+")
get_filename_component(CMAKE_RC_COMPILER_INIT $ENV{RC} PROGRAM PROGRAM_ARGS CMAKE_RC_FLAGS_ENV_INIT)
if(CMAKE_RC_FLAGS_ENV_INIT)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineRCCompiler.cmake | 10 +++++-----
Source/CMakeVersion.cmake | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list