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 8fc1a2c2c412ea5a75e0bffc353f25c20f2b829a (commit)
via 223850576b070f66a5eec5340b7eefa8ecf7b5de (commit)
from dabf7435a43085960a570ea746a65198630a467a (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=8fc1a2c2c412ea5a75e0bffc353f25c20f2b829a
commit 8fc1a2c2c412ea5a75e0bffc353f25c20f2b829a
Merge: dabf743 2238505
Author: David Cole <david.c...@kitware.com>
AuthorDate: Wed Nov 28 12:13:39 2012 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Nov 28 12:13:39 2012 -0500
Merge topic 'fix-watcom-test-timeout' into next
2238505 Watcom: Avoid prompt from wmake about dll with no exports...
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=223850576b070f66a5eec5340b7eefa8ecf7b5de
commit 223850576b070f66a5eec5340b7eefa8ecf7b5de
Author: David Cole <david.c...@kitware.com>
AuthorDate: Wed Nov 28 12:11:52 2012 -0500
Commit: David Cole <david.c...@kitware.com>
CommitDate: Wed Nov 28 12:11:52 2012 -0500
Watcom: Avoid prompt from wmake about dll with no exports...
...by simply building a STATIC lib for the test, instead of a
SHARED one. Fixes test timeout on the Watcom dashboards.
diff --git a/Tests/EmptyDepends/CMakeLists.txt
b/Tests/EmptyDepends/CMakeLists.txt
index a24382c..832d9dc 100644
--- a/Tests/EmptyDepends/CMakeLists.txt
+++ b/Tests/EmptyDepends/CMakeLists.txt
@@ -12,4 +12,4 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/qrc_my.cxx
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/my.qrc
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/my.qrc)
-add_library(qrc SHARED ${CMAKE_BINARY_DIR}/qrc_my.cxx)
+add_library(qrc STATIC ${CMAKE_BINARY_DIR}/qrc_my.cxx)
-----------------------------------------------------------------------
Summary of changes:
Tests/EmptyDepends/CMakeLists.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
