[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2430-g6a4cc0e

[Rolf Eike Beer]

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  6a4cc0e72d2366f1386092e54bab2bfd20d2b65b (commit)
       via  23b405d742011e8478e6665c259d8dbf750cbc0e (commit)
      from  2bb14d7a833041209d3ea4350ea43243c1df1aee (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=6a4cc0e72d2366f1386092e54bab2bfd20d2b65b
commit 6a4cc0e72d2366f1386092e54bab2bfd20d2b65b
Merge: 2bb14d7 23b405d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 17 02:55:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 17 02:55:58 2014 -0400

    Merge topic 'hp-cpp98-tests' into next
    
    23b405d7 properly propagate -AA for all tests failing with old HP compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23b405d742011e8478e6665c259d8dbf750cbc0e
commit 23b405d742011e8478e6665c259d8dbf750cbc0e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 17 08:55:39 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Apr 17 08:55:39 2014 +0200

    properly propagate -AA for all tests failing with old HP compiler

diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index a48498a..6a2a3a9 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -3,6 +3,13 @@ project(AliasTarget)
 
 set(CMAKE_CXX_STANDARD 98)
 
+# Those version of the HP compiler that need a flag to get proper C++98
+# template support need also a flag to use the newer C++ library.
+if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
+    CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
+endif ()
+
 add_library(foo SHARED empty.cpp)
 add_library(PREFIX::Foo ALIAS foo)
 add_library(Another::Alias ALIAS foo)
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index 5f7863f..118c7fc 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -367,6 +367,13 @@ endif()
 #
 set(CMAKE_CXX_STANDARD 98)
 
+# Those version of the HP compiler that need a flag to get proper C++98
+# template support need also a flag to use the newer C++ library.
+if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
+    CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
+endif ()
+
 #
 # Create the libs and the main exe
 #
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 6427bfd..bf153a8 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -59,6 +59,13 @@ include(GenerateExportHeader)
 
 set(CMAKE_CXX_STANDARD 98)
 
+# Those version of the HP compiler that need a flag to get proper C++98
+# template support need also a flag to use the newer C++ library.
+if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
+    CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
+endif ()
+
 add_subdirectory(lib_shared_and_static)
 
 add_compiler_export_flags()
diff --git a/Tests/Plugin/CMakeLists.txt b/Tests/Plugin/CMakeLists.txt
index 7266c64..0a17c5b 100644
--- a/Tests/Plugin/CMakeLists.txt
+++ b/Tests/Plugin/CMakeLists.txt
@@ -27,6 +27,13 @@ include_directories(
 # We need proper C++98 support from the compiler
 set(CMAKE_CXX_STANDARD 98)
 
+# Those version of the HP compiler that need a flag to get proper C++98
+# template support need also a flag to use the newer C++ library.
+if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
+    CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
+endif ()
+
 # Create an executable that exports an API for use by plugins.
 add_executable(example_exe src/example_exe.cxx)
 set_target_properties(example_exe PROPERTIES

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

Summary of changes:
 Tests/AliasTarget/CMakeLists.txt                 |    7 +++++++
 Tests/ComplexOneConfig/CMakeLists.txt            |    7 +++++++
 Tests/Module/GenerateExportHeader/CMakeLists.txt |    7 +++++++
 Tests/Plugin/CMakeLists.txt                      |    7 +++++++
 4 files changed, 28 insertions(+)


hooks/post-receive
-- 
CMake