[Cmake-commits] CMake branch, next, updated. v3.0.2-5456-g4185fe9
Stephen Kelly
steveire at gmail.com
Wed Sep 24 17:45:41 EDT 2014
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 4185fe94803811053da02d4b0a99ed9cecda3767 (commit)
via 2d3e0f93d2edb1f35c14ee4911763941a1edd737 (commit)
from 2ee6f7d43da4c5a3d466915f81c9775feb2c777e (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=4185fe94803811053da02d4b0a99ed9cecda3767
commit 4185fe94803811053da02d4b0a99ed9cecda3767
Merge: 2ee6f7d 2d3e0f9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 24 17:45:40 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 24 17:45:40 2014 -0400
Merge topic 'autorcc-depends' into next
2d3e0f93 Fix typo.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d3e0f93d2edb1f35c14ee4911763941a1edd737
commit 2d3e0f93d2edb1f35c14ee4911763941a1edd737
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 24 23:44:52 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 24 23:44:52 2014 +0200
Fix typo.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 0f53a87..5944d67 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -131,7 +131,7 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
if (NOT EXISTS ${info_file})
unset(info_file)
foreach(_config ${CMAKE_CONFIGURATION_TYPES})
- set(_info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${config}.txt")
+ set(_info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${_config}.txt")
if (EXISTS ${_info_file})
set(info_file ${_info_file})
break()
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list