mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-17 20:20:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindSquish: Fix finding on Windows

Browse Source 
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.
This commit is contained in:
Frederik Gladhorn
2020-04-16 23:48:05 +02:00
parent 5f20e85412
commit 0bc4fa2be2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FindSquish.cmake
View File

@@ -137,7 +137,8 @@ if(NOT SQUISH_INSTALL_DIR)
string(REPLACE "//" "/" SQUISH_INSTALL_DIR_SEARCH "${SQUISH_INSTALL_DIR_SEARCH}") string(REPLACE "//" "/" SQUISH_INSTALL_DIR_SEARCH "${SQUISH_INSTALL_DIR_SEARCH}")
# Look for an installation # Look for an installation
find_path(SQUISH_INSTALL_DIR bin/squishrunner find_path(SQUISH_INSTALL_DIR
NAMES bin/squishrunner bin/squishrunner.exe
HINTS HINTS
# Look for an environment variable SQUISH_INSTALL_DIR. # Look for an environment variable SQUISH_INSTALL_DIR.
ENV SQUISH_INSTALL_DIR ENV SQUISH_INSTALL_DIR