[Cmake-commits] CMake branch, next, updated. v2.8.2-822-g6a9e59c
Ben Boeckel
ben.boeckel at kitware.com
Fri Sep 17 10:05:53 EDT 2010
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 6a9e59c2744762e3fb7926c89beb982a7de6b7e0 (commit)
via dee19760a701408411d6b20cc623ccb53ce54732 (commit)
via f231ce5ce3968d963f81dd3a5093ff2b13f17062 (commit)
via a117e02cc8e204ed5992e110c62942d80390bfe7 (commit)
from 1c76a6b5ca512d7ab242e37a054f54521fcda5fe (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=6a9e59c2744762e3fb7926c89beb982a7de6b7e0
commit 6a9e59c2744762e3fb7926c89beb982a7de6b7e0
Merge: 1c76a6b dee1976
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Sep 17 10:05:49 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 17 10:05:49 2010 -0400
Merge topic 'dev/strict-mode' into next
dee1976 Fix typo in VariableUnusedViaUnset test
f231ce5 Remove old false positive avoidance code
a117e02 Revert "Add test for unused warnings at the end of scope"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dee19760a701408411d6b20cc623ccb53ce54732
commit dee19760a701408411d6b20cc623ccb53ce54732
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Sep 17 10:04:18 2010 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Sep 17 10:04:18 2010 -0400
Fix typo in VariableUnusedViaUnset test
diff --git a/Tests/VariableUnusedViaUnset/CMakeLists.txt b/Tests/VariableUnusedViaUnset/CMakeLists.txt
index 886508e..4b4031d 100644
--- a/Tests/VariableUnusedViaUnset/CMakeLists.txt
+++ b/Tests/VariableUnusedViaUnset/CMakeLists.txt
@@ -1,7 +1,7 @@
# NOTE: Changing lines in here changes the test results since the first
# instance shouldn't warn, but the second should and they have the same message
-# A warning should NOT ne issued for this line:
+# A warning should NOT be issued for this line:
set(UNUSED_VARIABLE)
# Warning should occur here:
set(UNUSED_VARIABLE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f231ce5ce3968d963f81dd3a5093ff2b13f17062
commit f231ce5ce3968d963f81dd3a5093ff2b13f17062
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Sep 17 10:02:15 2010 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Sep 17 10:02:15 2010 -0400
Remove old false positive avoidance code
From email explaining existence in the first place:
This is from before when the used checks throwing false
positives about unused due to changing the definition without
checking whether it *had* a value to begin with and me not
realizing they were false positives. I was thinking that it was
warning from ARGC et. al. not being used since the previous
macro or function call and the new value warning about
overwriting the old value.
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index b226574..ec4fd16 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -112,7 +112,6 @@ bool cmFunctionHelperCommand::InvokeInitialPass
// set the value of argc
cmOStringStream strStream;
strStream << expandedArgs.size();
- this->Makefile->MarkVariableAsUsed("ARGC");
this->Makefile->AddDefinition("ARGC",strStream.str().c_str());
this->Makefile->MarkVariableAsUsed("ARGC");
@@ -121,7 +120,6 @@ bool cmFunctionHelperCommand::InvokeInitialPass
{
cmOStringStream tmpStream;
tmpStream << "ARGV" << t;
- this->Makefile->MarkVariableAsUsed(tmpStream.str().c_str());
this->Makefile->AddDefinition(tmpStream.str().c_str(),
expandedArgs[t].c_str());
this->Makefile->MarkVariableAsUsed(tmpStream.str().c_str());
@@ -156,10 +154,8 @@ bool cmFunctionHelperCommand::InvokeInitialPass
}
cnt ++;
}
- this->Makefile->MarkVariableAsUsed("ARGV");
this->Makefile->AddDefinition("ARGV", argvDef.c_str());
this->Makefile->MarkVariableAsUsed("ARGV");
- this->Makefile->MarkVariableAsUsed("ARGN");
this->Makefile->AddDefinition("ARGN", argnDef.c_str());
this->Makefile->MarkVariableAsUsed("ARGN");
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a117e02cc8e204ed5992e110c62942d80390bfe7
commit a117e02cc8e204ed5992e110c62942d80390bfe7
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Sep 17 09:47:17 2010 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Sep 17 09:47:17 2010 -0400
Revert "Add test for unused warnings at the end of scope"
This reverts commit 91c4c9921c40361df860c1384a46ed77c6118c23.
The test doesn't work yet and should not have been put on this branch
yet.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index adc4f90..739dcdf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1104,21 +1104,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
FAIL_REGULAR_EXPRESSION ":5: warning: \\(unsetting\\) unused variable 'UNUSED_VARIABLE'")
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaUnset")
- ADD_TEST(WarnUnusedUnusedViaScope ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/VariableUnusedViaScope"
- "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaScope"
- --build-generator ${CMAKE_TEST_GENERATOR}
- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
- --build-noclean
- --build-project WarnUnusedUnusedViaScope
- --build-options "--warn-unused-vars")
- SET_TESTS_PROPERTIES(WarnUnusedUnusedViaScope PROPERTIES
- PASS_REGULAR_EXPRESSION "warning: \\(out of scope\\) unused variable 'UNUSED_VARIABLE'")
- SET_TESTS_PROPERTIES(WarnUnusedUnusedViaScope PROPERTIES
- FAIL_REGULAR_EXPRESSION "warning: \\(unsetting\\) unused variable 'UNUSED_VARIABLE'")
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaScope")
-
ADD_TEST(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/VariableUsage"
diff --git a/Tests/VariableUnusedViaScope/CMakeLists.txt b/Tests/VariableUnusedViaScope/CMakeLists.txt
deleted file mode 100644
index a024bc5..0000000
--- a/Tests/VariableUnusedViaScope/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-set(UNUSED_VARIABLE)
-# Warning should occur here
-----------------------------------------------------------------------
Summary of changes:
Source/cmFunctionCommand.cxx | 4 ----
Tests/CMakeLists.txt | 15 ---------------
Tests/VariableUnusedViaScope/CMakeLists.txt | 2 --
Tests/VariableUnusedViaUnset/CMakeLists.txt | 2 +-
4 files changed, 1 insertions(+), 22 deletions(-)
delete mode 100644 Tests/VariableUnusedViaScope/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list