summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-08 17:06:14 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-08 17:06:14 (GMT)
commitf401b925cf1711d4b77b1039204cb78c10b9252d (patch)
tree4c2532a4c9acf42def829696511e4d554c16e342 /Source/kwsys/CMakeLists.txt
parent9b1abc543e9aee946e093229e1715c4b8a961514 (diff)
parentc54be58309fbf9c2a5cfec8ba190c631e1db4a6c (diff)
downloadCMake-f401b925cf1711d4b77b1039204cb78c10b9252d.zip
CMake-f401b925cf1711d4b77b1039204cb78c10b9252d.tar.gz
CMake-f401b925cf1711d4b77b1039204cb78c10b9252d.tar.bz2
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/CMakeLists.txt')
-rw-r--r--Source/kwsys/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index 977d57b..5e6a226 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -299,6 +299,13 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
IF(CMAKE_SYSTEM MATCHES "HP-UX")
SET(KWSYS_PLATFORM_CXX_TEST_EXTRA_FLAGS "+p")
+ IF(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)
+ # use new C++ library and improved template support
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA +hpxstd98")
+ ENDIF()
+ ENDIF()
ENDIF(CMAKE_SYSTEM MATCHES "HP-UX")
ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)