[Cmake-commits] CMake branch, next, updated. v2.8.5-1647-gec40356

[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  ec403565df94e2bd2773c9604d23c3b90f3f1cb8 (commit)
       via  a6ccf3cb6552f8f2b7b6adaf419a278efd085ac3 (commit)
      from  faa760ca18092f4fc914b745099ad6ff593d0def (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=ec403565df94e2bd2773c9604d23c3b90f3f1cb8
commit ec403565df94e2bd2773c9604d23c3b90f3f1cb8
Merge: faa760c a6ccf3c
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 18 12:40:03 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 18 12:40:03 2011 -0400

    Merge topic 'UsingCMakeLikePkgConfig2' into next
    
    a6ccf3c Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test Makefile


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6ccf3cb6552f8f2b7b6adaf419a278efd085ac3
commit a6ccf3cb6552f8f2b7b6adaf419a278efd085ac3
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 18 18:43:33 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 18 18:43:33 2011 +0200

    Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test Makefile
    
    This should make the test succeed in the coverage builds, where CXXFLAGS
    and LDFLAGS are set accordingly.
    
    Alex

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index 2d4301a..073d82e 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 $(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
+	"@CMAKE_CXX_COMPILER@" $(CXXFLAGS) -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 $(shell "@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@" $(LDFLAGS) -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