From 439877f6208e25790ab14ae0e66efc392949e9e2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 2 Sep 2010 12:14:06 -0400 Subject: [PATCH] Be consistent with single and double quotes --- Source/cmake.cxx | 2 +- Tests/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f4680ca972..757ad6f71d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -4496,7 +4496,7 @@ void cmake::RunCheckForUnusedVariables() const { if(!it->second) { - std::string message = "warning: The variable, \"" + it->first + "\", given " + std::string message = "warning: The variable, '" + it->first + "', given " "on the command line, was not used within the build."; cmSystemTools::Message(message.c_str()); } diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 481be09f99..995a7495bb 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1082,9 +1082,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-noclean --build-project WarnUnusedCliUnused - --build-options "-DUNUSED_VARIABLE=Unused") + --build-options "-DUNUSED_CLI_VARIABLE=Unused") SET_TESTS_PROPERTIES(WarnUnusedCliUnused PROPERTIES - PASS_REGULAR_EXPRESSION "warning: The variable, \"UNUSED_VARIABLE\"") + PASS_REGULAR_EXPRESSION "warning: The variable, 'UNUSED_CLI_VARIABLE'") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused") ADD_TEST(WarnUnusedCliUsed ${CMAKE_CTEST_COMMAND} @@ -1099,7 +1099,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ SET_TESTS_PROPERTIES(WarnUnusedCliUsed PROPERTIES PASS_REGULAR_EXPRESSION "Usage proven") SET_TESTS_PROPERTIES(WarnUnusedCliUsed PROPERTIES - FAIL_REGULAR_EXPRESSION "warning: The variable, \"USED_VARIABLE\"") + FAIL_REGULAR_EXPRESSION "warning: The variable, 'USED_VARIABLE'") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUsed") ADD_TEST(WarnUninitialized ${CMAKE_CTEST_COMMAND}