[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-379-ga550b6c

[Chuck Atkins]

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  a550b6cabe68601bd5e99552bc47b52a92832314 (commit)
       via  dc7a5dbe375f4361999e3e04f011dce93e2217e6 (commit)
      from  621450b6b9a67572e9221406fdf5d8fec530f098 (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=a550b6cabe68601bd5e99552bc47b52a92832314
commit a550b6cabe68601bd5e99552bc47b52a92832314
Merge: 621450b dc7a5db
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Nov 6 12:47:05 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 12:47:05 2014 -0500

    Merge topic 'fix-gcc-hppa' into next
    
    dc7a5dbe Adjust bootstrap to detect parisc on hpux


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc7a5dbe375f4361999e3e04f011dce93e2217e6
commit dc7a5dbe375f4361999e3e04f011dce93e2217e6
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Nov 6 12:45:32 2014 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Nov 6 12:45:32 2014 -0500

    Adjust bootstrap to detect parisc on hpux

diff --git a/bootstrap b/bootstrap
index f8f6d64..00af2a1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -122,18 +122,33 @@ else
   cmake_system_openvms=false
 fi
 
+# Determine whether this is HP-UX
+if echo "${cmake_system}" | grep HP-UX >/dev/null 2>&1; then
+  cmake_system_hpux=true
+else
+  cmake_system_hpux=false
+fi
+
 # Determine whether this is Linux
 if echo "${cmake_system}" | grep Linux >/dev/null 2>&1; then
   cmake_system_linux=true
-  # find out if it is a HP PA-RISC machine
+else
+  cmake_system_linux=false
+fi
+
+# Determine whether this is a PA-RISC machine
+if ${cmake_system_linux}; then
   if uname -m | grep parisc >/dev/null 2>&1; then
     cmake_machine_parisc=true
   else
     cmake_machine_parisc=false
   fi
-else
-  cmake_system_linux=false
-  cmake_machine_parisc=false
+elif ${cmake_system_hpux}; then
+  if uname -m | grep ia64 >/dev/null 2>&1; then
+    cmake_machine_parisc=false
+  else
+    cmake_machine_parisc=true
+  fi
 fi
 
 # Choose the generator to use for bootstrapping.

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

Summary of changes:
 bootstrap |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake