[Cmake-commits] CMake branch, next, updated. v2.8.5-1548-g1fdc255

[Alexander Neundorf]

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  1fdc2556e9cdfdd066fdded83aca0c6907523e76 (commit)
       via  6bb4ca3802d2fc83f1072adfde6f1075aa2992c4 (commit)
      from  a8ce92abf0226cde3a55a440ff4b34897c99f475 (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=1fdc2556e9cdfdd066fdded83aca0c6907523e76
commit 1fdc2556e9cdfdd066fdded83aca0c6907523e76
Merge: a8ce92a 6bb4ca3
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Aug 14 09:35:35 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 14 09:35:35 2011 -0400

    Merge topic 'UsingCMakeLikePkgConfig2' into next
    
    6bb4ca3 The makefile for the test was kindof wrong


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bb4ca3802d2fc83f1072adfde6f1075aa2992c4
commit 6bb4ca3802d2fc83f1072adfde6f1075aa2992c4
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Aug 14 15:38:24 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Aug 14 15:38:24 2011 +0200

    The makefile for the test was kindof wrong
    
    Alex

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index 5105d99..5e42305 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -1,7 +1,9 @@
 all: clean pngtest
 
-pngtest: main.o
+main.o: main.cpp
 	"@CMAKE_CXX_COMPILER@" -c `"@cmakeExecutable@" --find-package -DNAME=PNG -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=COMPILE` main.cpp
+
+pngtest: main.o
 	"@CMAKE_CXX_COMPILER@" -o pngtest main.o `"@cmakeExecutable@" --find-package -DNAME=PNG -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=LINK`
 
 clean:

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

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


hooks/post-receive
-- 
CMake