[Cmake-commits] CMake branch, next, updated. v2.8.5-1632-g65dc7ab

[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  65dc7ab8d33095b78adf49035a31fbab5a028862 (commit)
       via  ab57ff6156a725664fce995a9460de839018405c (commit)
      from  0e2c11d41d57a4d69fbc93479a193b2995706d7f (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=65dc7ab8d33095b78adf49035a31fbab5a028862
commit 65dc7ab8d33095b78adf49035a31fbab5a028862
Merge: 0e2c11d ab57ff6
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Aug 17 16:48:23 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 16:48:23 2011 -0400

    Merge topic 'UsingCMakeLikePkgConfig2' into next
    
    ab57ff6 Make the --find-package test harder


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab57ff6156a725664fce995a9460de839018405c
commit ab57ff6156a725664fce995a9460de839018405c
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Aug 17 22:51:57 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Aug 17 22:51:57 2011 +0200

    Make the --find-package test harder
    
    Now it is guaranteed that the include paths always contain a space.
    This should make the cont. build fail.
    
    Alex

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index 6bcd9b6..2d4301a 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -1,10 +1,10 @@
 all: clean pngtest
 
 main.o: main.cpp
-	"@CMAKE_CXX_COMPILER@" -c `"@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=COMPILE` main.cpp
+	"@CMAKE_CXX_COMPILER@" -c $(shell "@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -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 -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=LINK`
+	"@CMAKE_CXX_COMPILER@" -o pngtest main.o $(shell "@cmakeExecutable@" --find-package -DCMAKE_MODULE_PATH="@CMAKE_CURRENT_BINARY_DIR@" -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=@CMAKE_CXX_COMPILER_ID@ -DMODE=LINK)
 
 clean:
 	rm -f *.o pngtest

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

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


hooks/post-receive
-- 
CMake