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 477ed703a84bc6ea557137159d9f7afab5896d7a (commit)
via 185b4efe332d3d5465b307b29e5439427e863b2c (commit)
from 082b5dc809cf8cf590f7b59450a7339afe7381f5 (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=477ed703a84bc6ea557137159d9f7afab5896d7a
commit 477ed703a84bc6ea557137159d9f7afab5896d7a
Merge: 082b5dc 185b4ef
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Sat Apr 12 18:49:10 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Apr 12 18:49:10 2014 -0400
Merge topic 'hpux-acc-ansi98' into next
185b4efe CompileFlags: add better selection which aCC version gets -AA
+hpxstd98 flags
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=185b4efe332d3d5465b307b29e5439427e863b2c
commit 185b4efe332d3d5465b307b29e5439427e863b2c
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Sun Apr 13 00:48:02 2014 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Sun Apr 13 00:48:02 2014 +0200
CompileFlags: add better selection which aCC version gets -AA +hpxstd98
flags
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 873af8f..5874031 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -54,8 +54,12 @@ if(CMAKE_SYSTEM MATCHES "OSF1-V.*")
endif()
if(CMAKE_SYSTEM_NAME MATCHES "HP-UX" AND CMAKE_CXX_COMPILER_ID MATCHES "HP")
- # it is known that version 3.85 fails and 6.25 works without these flags
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4)
+ # HP aCC since version 3.80 supports the flag +hpxstd98 to get ANSI C++98
+ # template support. It is known that version 6.25 doesn't need that flag.
+ # Versions prior to 3.80 will not be able to build CMake. Current assumption:
+ # it is needed for every version from 3.80 to 4 to get it working.
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4 AND
+ NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.80)
# use new C++ library and improved template support
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA +hpxstd98")
endif()
-----------------------------------------------------------------------
Summary of changes:
CompileFlags.cmake | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
