[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1732-gf3c55a8

[Rolf Eike Beer]

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  f3c55a83742f10cd1fdb2bb17a255bd63c1329ce (commit)
       via  b116ba07e5cdf0067983e91a25236d716895a011 (commit)
      from  e723f9fa74939b37b11fc05756dae8ee8976bb31 (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=f3c55a83742f10cd1fdb2bb17a255bd63c1329ce
commit f3c55a83742f10cd1fdb2bb17a255bd63c1329ce
Merge: e723f9f b116ba0
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 1 14:19:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 1 14:19:45 2014 -0400

    Merge topic 'hpux-compile' into next
    
    b116ba07 set compile flags to fix build on older versions of HP-UX with the HP compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b116ba07e5cdf0067983e91a25236d716895a011
commit b116ba07e5cdf0067983e91a25236d716895a011
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Mar 27 22:30:23 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Apr 1 20:19:33 2014 +0200

    set compile flags to fix build on older versions of HP-UX with the HP compiler

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 24ac58d..88c5156 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -54,6 +54,14 @@ if(CMAKE_SYSTEM MATCHES "OSF1-V.*")
   endif()
 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)
+    # use new C++ library and improved template support
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA +hpxstd98")
+  endif()
+endif()
+
 # use the ansi CXX compile flag for building cmake
 if (CMAKE_ANSI_CXXFLAGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")
diff --git a/bootstrap b/bootstrap
index 4e61f3e..233806c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1086,8 +1086,8 @@ if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then
   cmake_test_flags=
 
   # If we are on HP-UX, check for -Ae for the C compiler.
-  cmake_test_flags="-Ae"
   if [ "x${cmake_system}" = "xHP-UX" ]; then
+    cmake_test_flags="-Ae"
     TMPFILE=`cmake_tmp_file`
     echo '
     int main(int argc, char** argv) { (void)argc; (void)argv; return 0; }
@@ -1108,6 +1108,29 @@ if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then
       echo "${cmake_c_compiler} does not need ${cmake_test_flags}"
     fi
     rm -f "${TMPFILE}.c"
+    echo '
+    #include <iostream>
+    int main(int argc, char** argv) {
+    for(int i=0; i < 1; ++i);
+    for(int i=0; i < 1; ++i);
+    (void)argc; (void)argv; return 0; }
+' > ${TMPFILE}.cxx
+    cmake_need_AAstd98=0
+    cmake_test_flags="-AA +hpxstd98"
+    if cmake_try_run "${cmake_cxx_compiler}" "${cmake_cxx_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then
+      :
+    else
+      if cmake_try_run "${cmake_cxx_compiler}" \
+        "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then
+        cmake_need_AAstd98=1
+      fi
+    fi
+    if [ "x${cmake_need_AAstd98}" = "x1" ]; then
+      cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}"
+      echo "${cmake_cxx_compiler} needs ${cmake_test_flags}"
+    else
+      echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}"
+    fi
   fi
   cmake_test_flags=
 fi

-----------------------------------------------------------------------

Summary of changes:
 CompileFlags.cmake |    8 ++++++++
 bootstrap          |   25 ++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake