[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2796-g312e35b
Brad King
brad.king at kitware.com
Tue May 6 13:27:59 EDT 2014
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 312e35bc896e40e7dc6613cfc485bd61741d5e93 (commit)
via 500d83ba8c1653279a37057e30ce51c835d19c0d (commit)
via f347fd12f3d949b2c2e1db285f62ba71720af7ca (commit)
via 4ca9b0086f4982f9bfc6e5f3e6265db84f95b616 (commit)
from 0d3153a25bd5983480400d42e57e74ebf25a44ba (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=312e35bc896e40e7dc6613cfc485bd61741d5e93
commit 312e35bc896e40e7dc6613cfc485bd61741d5e93
Merge: 0d3153a 500d83b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 13:27:58 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 13:27:58 2014 -0400
Merge topic 'hpux-compile' into next
500d83ba CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags
f347fd12 CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC
4ca9b008 CompileFlags: Test for C++ features after selecting flags
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=500d83ba8c1653279a37057e30ce51c835d19c0d
commit 500d83ba8c1653279a37057e30ce51c835d19c0d
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Apr 13 00:48:02 2014 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 6 13:25:01 2014 -0400
CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags
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()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f347fd12f3d949b2c2e1db285f62ba71720af7ca
commit f347fd12f3d949b2c2e1db285f62ba71720af7ca
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: Tue May 6 13:23:58 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 69dcbce..45f67cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1085,8 +1085,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; }
@@ -1107,6 +1107,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=4ca9b0086f4982f9bfc6e5f3e6265db84f95b616
commit 4ca9b0086f4982f9bfc6e5f3e6265db84f95b616
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: Tue May 6 13:23:51 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
More information about the Cmake-commits
mailing list