[Cmake-commits] CMake branch, next, updated. v3.2.2-2072-ga0e83f7

[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  a0e83f77711e3f3f4d698099fba7cd7283474f18 (commit)
       via  4fc47424774657a44fc6ac118d1d1abb360db38c (commit)
      from  43d929112275e2edac4ab1cdcaa0c6012a8cc4bf (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=a0e83f77711e3f3f4d698099fba7cd7283474f18
commit a0e83f77711e3f3f4d698099fba7cd7283474f18
Merge: 43d9291 4fc4742
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 23 11:12:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 23 11:12:02 2015 -0400

    Merge topic 'test-ExportImport-AIX-GCC' into next
    
    4fc47424 Tests: Fix ExportImport on AIX with GCC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fc47424774657a44fc6ac118d1d1abb360db38c
commit 4fc47424774657a44fc6ac118d1d1abb360db38c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 23 10:53:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 23 10:53:39 2015 -0400

    Tests: Fix ExportImport on AIX with GCC
    
    The iface_test_bld gets the excludedFromAll include directory with
    "-isystem" because it is added indirectly through an imported target.
    On AIX with GCC the -isystem flag causes sources to be preprocessed as:
    
      # 3 "/.../excludedFromAll.h" 2 3 4
    
    The flags after the file name are documented here:
    
      https://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
    
    and the "4" flag says that following content is extern "C".  This
    causes the excludedFromAll function to be declared as a C symbol
    and not mangled for C++, which fails to link later because the
    symbol is really provided as C++.
    
    Work around this by setting the NO_SYSTEM_FROM_IMPORTED target property
    on iface_test_bld.  Somehow iface_test_exp does not end up with -isystem
    so we do not need this workaround for that target.

diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index ced7b03..17d983a 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -255,6 +255,7 @@ add_subdirectory(excludedFromAll)
 
 add_executable(iface_test_bld iface_test.cpp)
 target_link_libraries(iface_test_bld bld_testSharedLibDepends)
+set_property(TARGET iface_test_bld PROPERTY NO_SYSTEM_FROM_IMPORTED 1)
 
 set_property(TARGET bld_testSharedLibRequired APPEND PROPERTY
     LINK_INTERFACE_LIBRARIES

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

Summary of changes:
 Tests/ExportImport/Import/A/CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake