diff options
| author | Frederik Gladhorn <gladhorn@kde.org> | 2020-04-16 21:48:05 (GMT) |
|---|---|---|
| committer | Frederik Gladhorn <gladhorn@kde.org> | 2020-04-16 21:52:50 (GMT) |
| commit | 0bc4fa2be22a7973b8968a392f28fff59aa115e3 (patch) | |
| tree | dd6189e5d702e70de8dc7496233a29fca99d865a /Modules | |
| parent | 5f20e854122e19ed867ea3edf32d41cf6e8f3be0 (diff) | |
| download | CMake-0bc4fa2be22a7973b8968a392f28fff59aa115e3.zip CMake-0bc4fa2be22a7973b8968a392f28fff59aa115e3.tar.gz CMake-0bc4fa2be22a7973b8968a392f28fff59aa115e3.tar.bz2 | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindSquish.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
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 |