From 53c42cb4eab9f1e975b287e5b6784fb83f48be1f Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sun, 4 Nov 2012 19:41:34 +0100
Subject: Squish: rename squish_add_test() to squish_v3_add_test() and fix docs
 a bit

There is still a wrapper macro squish_add_test(), but this now
mentions that you should use squish_v3_add_test() instead.
Also, the docs for the macro were just wrong. They are at least
correct now, but still hard to understand (I don't have squish 3 around,
so I can't improve them).

Alex
---
 Modules/FindSquish.cmake | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'Modules/FindSquish.cmake')

diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index 667060c25c..8fb8c37127 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -1,6 +1,6 @@
 #
 # ---- Find Squish
-# This module can be used to find Squish (currently support is aimed at version 3).
+# This module can be used to find Squish. Currently Squish version 3 is supported.
 #
 # ---- Variables and Macros
 #  SQUISH_FOUND                    If false, don't try to use Squish
@@ -17,15 +17,19 @@
 #  SQUISH_SERVER_EXECUTABLE_FOUND  Was the server executable found?
 #  SQUISH_CLIENT_EXECUTABLE_FOUND  Was the client executable found?
 #
-# macro SQUISH_ADD_TEST(testName applicationUnderTest testSuite testCase)
+# macro SQUISH_V3_ADD_TEST(testName applicationUnderTest testCase envVars testWrapper)
+#   Use this macro to add a test using Squish 3.x.
 #
 # ---- Typical Use
 #  enable_testing()
 #  find_package(Squish)
 #  if (SQUISH_FOUND)
-#    SQUISH_ADD_TEST(myTestName myApplication testSuiteName testCaseName)
+#    SQUISH_ADD_TEST(myTestName myApplication testCase envVars testWrapper)
 #  endif ()
 #
+# macro SQUISH_ADD_TEST(testName applicationUnderTest testCase envVars testWrapper)
+#   This is deprecated. Use SQUISH_V3_ADD_TEST() if you are using Squish 3.x instead.
+
 
 #=============================================================================
 # Copyright 2008-2009 Kitware, Inc.
@@ -124,7 +128,8 @@ find_package_handle_standard_args(Squish  REQUIRED_VARS  SQUISH_INSTALL_DIR SQUI
                                           VERSION_VAR  SQUISH_VERSION )
 
 
-macro(SQUISH_ADD_TEST testName testAUT testCase envVars testWraper)
+
+macro(SQUISH_V3_ADD_TEST testName testAUT testCase envVars testWraper)
   add_test(${testName}
     ${CMAKE_COMMAND} -V -VV
     "-Dsquish_aut:STRING=${testAUT}"
@@ -141,3 +146,8 @@ macro(SQUISH_ADD_TEST testName testAUT testCase envVars testWraper)
     )
 endmacro()
 
+
+macro(SQUISH_ADD_TEST)
+  message(STATUS "Using squish_add_test() is deprecated, use squish_v3_add_test() instead.")
+  squish_v3_add_test(${ARGV})
+endmacro()
-- 
cgit v1.2.1