[Cmake-commits] CMake branch, next, updated. v3.6.1-1694-g4db1df2

[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  4db1df2da06cfa05b1f26546ca7deba40477b4e6 (commit)
       via  0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534 (commit)
      from  635a4f5a4fb965ab98cc60d068101ecb03d6b8d7 (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=4db1df2da06cfa05b1f26546ca7deba40477b4e6
commit 4db1df2da06cfa05b1f26546ca7deba40477b4e6
Merge: 635a4f5 0cbaaf2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 15:36:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 15:36:39 2016 -0400

    Merge topic 'GenerateExportHeader-fix-add_compiler_export_flags' into next
    
    0cbaaf2d GenerateExportHeader: Fix add_compiler_export_flags regression


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534
commit 0cbaaf2dc3e250fe0f4b056e229e3fcfbe6a8534
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 15:32:32 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 1 15:33:49 2016 -0400

    GenerateExportHeader: Fix add_compiler_export_flags regression
    
    The mechanical conversion in commit 5d0d980d (Use string(APPEND) in
    Modules, 2016-07-28) accidentally introduced use of
    
      string(APPEND ... PARENT_SCOPE)
    
    Split that into the string(APPEND) and set(PARENT_SCOPE) pieces.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 735a0d7..e33b927 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -415,6 +415,7 @@ function(add_compiler_export_flags)
   if(ARGC GREATER 0)
     set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE)
   else()
-    string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}" PARENT_SCOPE)
+    string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
   endif()
 endfunction()

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

Summary of changes:
 Modules/GenerateExportHeader.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake