[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1904-ga70783f

[Brad King]

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  a70783f36e7666a9d75a83dfbaef0c1a7bf972ee (commit)
       via  be53734d3c3d5e74ea2d119e4c15c66121283bca (commit)
       via  f4b9c6bbebb0757db2b87efd2239a8eb44d24092 (commit)
      from  7f1dcd387f6af3d689dc5f750fc3c3fdf9ebedda (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=a70783f36e7666a9d75a83dfbaef0c1a7bf972ee
commit a70783f36e7666a9d75a83dfbaef0c1a7bf972ee
Merge: 7f1dcd3 be53734
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 4 13:33:29 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 4 13:33:29 2014 -0400

    Merge topic 'hpux-compile' into next
    
    be53734d CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC
    f4b9c6bb CompileFlags: Test for C++ features after selecting flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be53734d3c3d5e74ea2d119e4c15c66121283bca
commit be53734d3c3d5e74ea2d119e4c15c66121283bca
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Mar 27 22:30:23 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 4 13:31:28 2014 -0400

    CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC
    
    These flags are needed to enable support for C++98.  Also teach the
    'bootstrap' script to add them if necessary.

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 332d742..873af8f 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -53,6 +53,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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4b9c6bbebb0757db2b87efd2239a8eb44d24092
commit f4b9c6bbebb0757db2b87efd2239a8eb44d24092
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 3 19:02:01 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 4 13:30:25 2014 -0400

    CompileFlags: Test for C++ features after selecting flags
    
    Some flags we select may affect availability of C++ features.

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 24ac58d..332d742 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -19,7 +19,6 @@ endif()
 if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
   set(CMAKE_SKIP_COMPATIBILITY_TESTS 1)
 endif()
-include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
 
 if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
   set(_INTEL_WINDOWS 1)
@@ -68,3 +67,5 @@ endif ()
 if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
 endif ()
+
+include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)

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

Summary of changes:


hooks/post-receive
-- 
CMake