From b878cd6fb4fee4c32bc97a7e63b8d25d2eab30cf Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Sun, 4 Nov 2012 19:22:27 +0100 Subject: [PATCH] Squish: use FPHSA Alex --- Modules/FindSquish.cmake | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index 032ed971d..6f34cccce 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -119,12 +119,10 @@ else() endif() # record if Squish was found -set(SQUISH_FOUND 1) -foreach(var SQUISH_INSTALL_DIR_FOUND SQUISH_CLIENT_EXECUTABLE_FOUND SQUISH_SERVER_EXECUTABLE_FOUND) - if(NOT ${var}) - set(SQUISH_FOUND 0) - endif() -endforeach() +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Squish REQUIRED_VARS SQUISH_INSTALL_DIR SQUISH_CLIENT_EXECUTABLE SQUISH_SERVER_EXECUTABLE + VERSION_VAR SQUISH_VERSION ) + macro(SQUISH_ADD_TEST testName testAUT testCase envVars testWraper) add_test(${testName}