From 0bc4fa2be22a7973b8968a392f28fff59aa115e3 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 16 Apr 2020 23:48:05 +0200 Subject: FindSquish: Fix finding on Windows The whole script looks rather dated and dusty, but it actually does find newer Squish versions - e.g. version 6.5 here. I assume more work is needed, but at least with this tiny patch the path is located on Windws when the SQUISH_INSTALL_DIR environment variable is set. --- Modules/FindSquish.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index 7d49505..e6f3ad4 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -137,7 +137,8 @@ if(NOT SQUISH_INSTALL_DIR) string(REPLACE "//" "/" SQUISH_INSTALL_DIR_SEARCH "${SQUISH_INSTALL_DIR_SEARCH}") # Look for an installation - find_path(SQUISH_INSTALL_DIR bin/squishrunner + find_path(SQUISH_INSTALL_DIR + NAMES bin/squishrunner bin/squishrunner.exe HINTS # Look for an environment variable SQUISH_INSTALL_DIR. ENV SQUISH_INSTALL_DIR -- cgit v0.12