summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2014-04-12 22:48:02 (GMT)
committerBrad King <brad.king@kitware.com>2014-05-06 17:25:01 (GMT)
commit500d83ba8c1653279a37057e30ce51c835d19c0d (patch)
treea3b3e01d5a31ceeb1ed38b0e2cd9a1d0d0d8ab83
parentf347fd12f3d949b2c2e1db285f62ba71720af7ca (diff)
downloadCMake-500d83ba8c1653279a37057e30ce51c835d19c0d.zip
CMake-500d83ba8c1653279a37057e30ce51c835d19c0d.tar.gz
CMake-500d83ba8c1653279a37057e30ce51c835d19c0d.tar.bz2
CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags
-rw-r--r--CompileFlags.cmake8
1 files changed, 6 insertions, 2 deletions
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()