From 185b4efe332d3d5465b307b29e5439427e863b2c Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Sun, 13 Apr 2014 00:48:02 +0200 Subject: [PATCH] CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags --- CompileFlags.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CompileFlags.cmake b/CompileFlags.cmake index 873af8f69..587403178 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()