[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5093-gb9f6973

Brad King brad.king at kitware.com
Tue Nov 12 09:40:57 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  b9f6973acaea63b45f97466fba8fa898094de968 (commit)
       via  ed675a92a1581214916030fd1e12d50810ad7dd4 (commit)
      from  cba9471effa94673598149124ec533e98a8afb71 (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=b9f6973acaea63b45f97466fba8fa898094de968
commit b9f6973acaea63b45f97466fba8fa898094de968
Merge: cba9471 ed675a9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 12 09:40:41 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 12 09:40:41 2013 -0500

    Merge topic 'create_test_sourcelist-clang-warnings' into next
    
    ed675a9 create_test_sourcelist: Fix linkage in generated test driver code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed675a92a1581214916030fd1e12d50810ad7dd4
commit ed675a92a1581214916030fd1e12d50810ad7dd4
Author:     Sean McBride <sean at rogue-research.com>
AuthorDate: Mon Nov 11 11:46:11 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 12 09:27:11 2013 -0500

    create_test_sourcelist: Fix linkage in generated test driver code
    
    Mark private function/global with static linkage.

diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 03916bf..82537ef 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -18,7 +18,7 @@ typedef struct
   MainFuncPointer func;
 } functionMapEntry;
 
-functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
+static functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
   @CMAKE_FUNCTION_TABLE_ENTIRES@
   {0,0}
 };
@@ -26,7 +26,7 @@ functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
 /* Allocate and create a lowercased copy of string
    (note that it has to be free'd manually) */
 
-char* lowercase(const char *string)
+static char* lowercase(const char *string)
 {
   char *new_string, *p;
 

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

Summary of changes:
 Templates/TestDriver.cxx.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list