[Cmake-commits] CMake branch, next, updated. v3.3.2-3434-g399b5bf

[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  399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8 (commit)
       via  85d7a610a2a5e5f82a8e4b3e1322c54e27862633 (commit)
      from  0b741bec4266a6507cd56f2f12cf743499df627b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8
commit 399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8
Merge: 0b741be 85d7a61
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 10:28:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 10:28:20 2015 -0400

    Merge topic 'test-FindPackageModeMakefileTest-flags' into next
    
    85d7a610 Tests: Use consistent C++ flags FindPackageModeMakefileTest


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85d7a610a2a5e5f82a8e4b3e1322c54e27862633
commit 85d7a610a2a5e5f82a8e4b3e1322c54e27862633
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 10:20:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 10:26:55 2015 -0400

    Tests: Use consistent C++ flags FindPackageModeMakefileTest
    
    Rather than using the CXXFLAGS environment variable in the make-only
    build, copy the CMAKE_CXX_FLAGS used to build the files on the CMake
    side.  This will account for any changes made by CompileFlags.cmake
    or cache-provided flags.

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index e4df9d6..8e7ff72 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -4,6 +4,7 @@ include cmakeExecutable.mk
 CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@"
 CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@"
 CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@"
+CMAKE_CXX_FLAGS = @CMAKE_CXX_FLAGS@
 
 CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_DIR) -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=$(CMAKE_CXX_COMPILER_ID)
 
@@ -14,7 +15,7 @@ all: pngtest
 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)
+	 printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)
@@ -22,7 +23,7 @@ main.o: clean main.cpp
 pngtest: main.o
 	@$(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)
+	 printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)

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

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


hooks/post-receive
-- 
CMake