[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5988-g56e4437

Brad King brad.king at kitware.com
Tue Dec 3 09:23:49 EST 2013


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  56e44372b3aab0819ceb9b94271b001dae44e49f (commit)
       via  5d2452d89ac3508ce3de404952b601d43ac5200f (commit)
      from  b10fcf75a29beffa9daf30f10ab2efe1d2113e26 (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=56e44372b3aab0819ceb9b94271b001dae44e49f
commit 56e44372b3aab0819ceb9b94271b001dae44e49f
Merge: b10fcf7 5d2452d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 3 09:23:41 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 3 09:23:41 2013 -0500

    Merge topic 'lang-flag-var-helpstrings' into next
    
    5d2452d Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d2452d89ac3508ce3de404952b601d43ac5200f
commit 5d2452d89ac3508ce3de404952b601d43ac5200f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 3 09:20:11 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 3 09:21:33 2013 -0500

    Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)
    
    s/defalut/default/
    
    Reported-by: Stephan Tolksdorf <st at quanttec.com>

diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index e1e7d26..e0cce45 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -128,7 +128,7 @@ endif()
 
 if(CMAKE_C_STANDARD_LIBRARIES_INIT)
   set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES_INIT}"
-    CACHE STRING "Libraries linked by defalut with all C applications.")
+    CACHE STRING "Libraries linked by default with all C applications.")
   mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
 endif()
 
diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
index a2cd4e0..3010a48 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -219,7 +219,7 @@ endif()
 
 if(CMAKE_CXX_STANDARD_LIBRARIES_INIT)
   set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES_INIT}"
-    CACHE STRING "Libraries linked by defalut with all C++ applications.")
+    CACHE STRING "Libraries linked by default with all C++ applications.")
   mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
 endif()
 
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake
index de40b2c..080dc68 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -218,7 +218,7 @@ endif()
 
 if(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
   set(CMAKE_Fortran_STANDARD_LIBRARIES "${CMAKE_Fortran_STANDARD_LIBRARIES_INIT}"
-    CACHE STRING "Libraries linked by defalut with all Fortran applications.")
+    CACHE STRING "Libraries linked by default with all Fortran applications.")
   mark_as_advanced(CMAKE_Fortran_STANDARD_LIBRARIES)
 endif()
 

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

Summary of changes:
 Modules/CMakeCInformation.cmake       |    2 +-
 Modules/CMakeCXXInformation.cmake     |    2 +-
 Modules/CMakeFortranInformation.cmake |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list