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 002fc94ec2e5c67e0aa846f29991df4094c7d07a (commit) via 98ef7370cf6a02dc61da5a437ba9534f2f1324be (commit) from 2a4db6f9af6370a9681eb0cc9f2528c0b1080321 (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=002fc94ec2e5c67e0aa846f29991df4094c7d07a commit 002fc94ec2e5c67e0aa846f29991df4094c7d07a Merge: 2a4db6f 98ef737 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Apr 16 12:31:36 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Apr 16 12:31:36 2014 -0400 Merge topic 'hp-cpp98-tests' into next 98ef7370 try a different approach to get the old HP compiler build these tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98ef7370cf6a02dc61da5a437ba9534f2f1324be commit 98ef7370cf6a02dc61da5a437ba9534f2f1324be Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Apr 16 18:31:24 2014 +0200 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Wed Apr 16 18:31:24 2014 +0200 try a different approach to get the old HP compiler build these tests diff --git a/Modules/Compiler/HP-CXX.cmake b/Modules/Compiler/HP-CXX.cmake index 9318b54..6411dac 100644 --- a/Modules/Compiler/HP-CXX.cmake +++ b/Modules/Compiler/HP-CXX.cmake @@ -9,7 +9,5 @@ set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> # to get it working. if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4 AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.80) - # The -AA option tells the compiler to use the new C++ lib, which you - # usually also want because otherwise many things will not work. - set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-AA +hpxstd98") + set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "+hpxstd98") endif() diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 3aaa5c7..bebb70f 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -397,6 +397,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 # ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/HP-CXX.cmake | 4 +--- Tests/Complex/CMakeLists.txt | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits