[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7029-g971791f

[Stephen Kelly]

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  971791f4a36fb419a545d9f0bc0a5ac02d54b44b (commit)
       via  dea71aae6d87189f935376bece28325316df4afc (commit)
      from  86f8465deb47e1b610904865dd9c5a314cd7a385 (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=971791f4a36fb419a545d9f0bc0a5ac02d54b44b
commit 971791f4a36fb419a545d9f0bc0a5ac02d54b44b
Merge: 86f8465 dea71aa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 11 07:59:56 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 11 07:59:56 2014 -0500

    Merge topic 'fix-FindPackageModeMakefileTest-Makefile' into next
    
    dea71aa Tests: Fix find-package mode test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dea71aae6d87189f935376bece28325316df4afc
commit dea71aae6d87189f935376bece28325316df4afc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 11 13:58:23 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 11 13:58:23 2014 +0100

    Tests: Fix find-package mode test.
    
    The all target was depending on the clean and pngtest targets, but
    when running the tests with -jN, those can be executed out of order.
    
    Make the main.o target depend on the clean target instead to fix
    this.

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index c91d8a0..e4df9d6 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -9,9 +9,9 @@ CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_D
 
 tmp = tmp.txt
 
-all: clean pngtest
+all: pngtest
 
-main.o: main.cpp
+main.o: clean main.cpp
 	@$(CMAKE_FOO) -DMODE=COMPILE >$(tmp)
 	@foo="`cat $(tmp)`"; \
 	 printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$$foo" >$(tmp)

-----------------------------------------------------------------------

Summary of changes:
 Tests/FindPackageModeMakefileTest/Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake