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 963a33f31873bafd0b3fa95279d9c3632500c271 (commit)
via 13125e4da781fd136581263ab31d435ae2ab8167 (commit)
from 5748a42d9a903ec8bc1acfd8160dc2bb5e923a5f (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=963a33f31873bafd0b3fa95279d9c3632500c271
commit 963a33f31873bafd0b3fa95279d9c3632500c271
Merge: 5748a42 13125e4
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Sep 30 03:56:18 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 30 03:56:18 2014 -0400
Merge topic 'autorcc-depends' into next
13125e4d Make sure the CMAKE_BUILD_TYPE is considered if present.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13125e4da781fd136581263ab31d435ae2ab8167
commit 13125e4da781fd136581263ab31d435ae2ab8167
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Sep 30 09:55:42 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Sep 30 09:55:42 2014 +0200
Make sure the CMAKE_BUILD_TYPE is considered if present.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index c7815f6..8adf87e 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -130,7 +130,7 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
if (NOT EXISTS ${info_file})
unset(info_file)
- foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+ foreach(_config ${CMAKE_BUILD_TYPE} ${CMAKE_CONFIGURATION_TYPES})
set(_info_file
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${_config}.txt")
if (EXISTS ${_info_file})
set(info_file ${_info_file})
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
