[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2481-g4bbabd0

[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  4bbabd0364c5fe6afe02fa416dea916e221d212f (commit)
       via  4f3e4441b22ac818f91e8eb6871a22f9642c8408 (commit)
      from  9e49ec12e6b67d6ef06ddb49e25b9e5063632458 (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=4bbabd0364c5fe6afe02fa416dea916e221d212f
commit 4bbabd0364c5fe6afe02fa416dea916e221d212f
Merge: 9e49ec1 4f3e444
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Apr 19 07:08:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 19 07:08:49 2014 -0400

    Merge topic 'hp-cpp98-tests' into next
    
    4f3e4441 fix typo


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f3e4441b22ac818f91e8eb6871a22f9642c8408
commit 4f3e4441b22ac818f91e8eb6871a22f9642c8408
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Apr 19 13:08:42 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Apr 19 13:08:42 2014 +0200

    fix typo

diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index 6a2a3a9..c50b4e6 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -3,8 +3,8 @@ project(AliasTarget)
 
 set(CMAKE_CXX_STANDARD 98)
 
-# Those version of the HP compiler that need a flag to get proper C++98
-# template support need also a flag to use the newer C++ library.
+# Those versions of the HP compiler that need a flag to get proper C++98
+# template support also need a flag to use the newer C++ library.
 if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
     CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 30daf3a..5fa46bf 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -401,8 +401,8 @@ set(CMAKE_CXX_STANDARD 98)
 #
 set(CMAKE_CXX_EXTENSIONS TRUE)
 
-# Those version of the HP compiler that need a flag to get proper C++98
-# template support need also a flag to use the newer C++ library.
+# Those versions of the HP compiler that need a flag to get proper C++98
+# template support also need a flag to use the newer C++ library.
 if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
     CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index 8c56bfc..d3d9132 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -371,8 +371,8 @@ set(CMAKE_CXX_STANDARD 98)
 #
 set(CMAKE_CXX_EXTENSIONS TRUE)
 
-# Those version of the HP compiler that need a flag to get proper C++98
-# template support need also a flag to use the newer C++ library.
+# Those versions of the HP compiler that need a flag to get proper C++98
+# template support also need a flag to use the newer C++ library.
 if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
     CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index bf153a8..b52c44d 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -59,8 +59,8 @@ include(GenerateExportHeader)
 
 set(CMAKE_CXX_STANDARD 98)
 
-# Those version of the HP compiler that need a flag to get proper C++98
-# template support need also a flag to use the newer C++ library.
+# Those versions of the HP compiler that need a flag to get proper C++98
+# template support also need a flag to use the newer C++ library.
 if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
     CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")
diff --git a/Tests/Plugin/CMakeLists.txt b/Tests/Plugin/CMakeLists.txt
index 0a17c5b..ecdece8 100644
--- a/Tests/Plugin/CMakeLists.txt
+++ b/Tests/Plugin/CMakeLists.txt
@@ -27,8 +27,8 @@ include_directories(
 # We need proper C++98 support from the compiler
 set(CMAKE_CXX_STANDARD 98)
 
-# Those version of the HP compiler that need a flag to get proper C++98
-# template support need also a flag to use the newer C++ library.
+# Those versions of the HP compiler that need a flag to get proper C++98
+# template support also need a flag to use the newer C++ library.
 if (CMAKE_CXX_COMPILER_ID STREQUAL HP AND
     CMAKE_CXX98_STANDARD_COMPILE_OPTION STREQUAL "+hpxstd98")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA")

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

Summary of changes:
 Tests/AliasTarget/CMakeLists.txt                 |    4 ++--
 Tests/Complex/CMakeLists.txt                     |    4 ++--
 Tests/ComplexOneConfig/CMakeLists.txt            |    4 ++--
 Tests/Module/GenerateExportHeader/CMakeLists.txt |    4 ++--
 Tests/Plugin/CMakeLists.txt                      |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake