diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-12-19 15:58:20 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-12-19 15:58:20 -0500 |
| commit | 35d141967a1ce42f8f22fda8423d893e2e2ed78a (patch) | |
| tree | c45b2c92965234a586c9deeb76582ebcc4a77c6f | |
| parent | 72aae0db662aecdcec85b658a452654f41c5b369 (diff) | |
Defend against cygwin-style AUTOBUILD path in environment.
| -rwxr-xr-x | indra/cmake/FindAutobuild.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake index d831257d4b..84ae41e8aa 100755 --- a/indra/cmake/FindAutobuild.cmake +++ b/indra/cmake/FindAutobuild.cmake @@ -13,6 +13,9 @@ IF (NOT AUTOBUILD_EXECUTABLE) # If cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var IF (DEFINED ENV{AUTOBUILD}) SET(AUTOBUILD_EXECUTABLE $ENV{AUTOBUILD}) + # In case $AUTOBUILD is a cygwin path, fix it back to Windows style + STRING(REGEX REPLACE "^/cygdrive/(.)/" "\\1:/" AUTOBUILD_EXECUTABLE + "${AUTOBUILD_EXECUTABLE}") ELSE (DEFINED ENV{AUTOBUILD}) IF(WIN32) SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe) |