[Cmake-commits] CMake branch, next, updated. v2.8.8-3236-ga4470b0

[Brad King]

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  a4470b092c5e4c33498afe53b9224049b4b50391 (commit)
       via  09ff191c3f38d9e1af1ca93ab731c26c096d189d (commit)
      from  49a7356c15072b46f64f16c9a4c092f88f175514 (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=a4470b092c5e4c33498afe53b9224049b4b50391
commit a4470b092c5e4c33498afe53b9224049b4b50391
Merge: 49a7356 09ff191
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 19 08:26:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 08:26:57 2012 -0400

    Merge topic 'test-FindPackageModeMakefileTest' into next
    
    09ff191 Fix FindPackageMode test Makefile (#13314)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09ff191c3f38d9e1af1ca93ab731c26c096d189d
commit 09ff191c3f38d9e1af1ca93ab731c26c096d189d
Author:     Daniel R. Gomez <gomez at teragram.com>
AuthorDate: Mon Jun 18 16:25:10 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 19 08:26:01 2012 -0400

    Fix FindPackageMode test Makefile (#13314)
    
    Use CXXFLAGS in the makefile's link rule since it invokes the C++
    compiler front-end.  Retool the makefile not to require GNU Make.  Using
    backticks instead of $(shell ...) is safe so long as one guards against
    the possibility of backslashes getting inside the backticks, so use
    temporary files and shell variables to avoid them.

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index 073d82e..f647901 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -1,10 +1,29 @@
+CMAKE = "@cmakeExecutable@"
+CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@"
+CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@"
+CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@"
+
+CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_DIR) -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=$(CMAKE_CXX_COMPILER_ID)
+
+tmp = tmp.txt
+
 all: clean pngtest
 
 main.o: 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
+	@$(CMAKE_FOO) -DMODE=COMPILE >$(tmp)
+	@foo="`cat $(tmp)`"; \
+	 printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$$foo" >$(tmp)
+	@cat $(tmp)
+	@sh $(tmp)
+	@rm -f $(tmp)
 
 pngtest: main.o
-	"@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)
+	@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
+	@foo="`cat $(tmp)`"; \
+	 printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
+	@cat $(tmp)
+	@sh $(tmp)
+	@rm -f $(tmp)
 
 clean:
-	rm -f *.o pngtest
+	rm -f $(tmp) *.o pngtest

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

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


hooks/post-receive
-- 
CMake