diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-22 08:26:47 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-22 08:26:47 -0500 |
| commit | e5771553c176072bb05f0f4f912fb979b3e4c5f0 (patch) | |
| tree | 9be6669a48145f31da27de4e39213425b4e364ea /indra/cmake | |
| parent | e7fca4af5064911dbec311770d953b8ae93b63d8 (diff) | |
| parent | f6abe4a2283e8c6b37ade3a9621d210a298f8d66 (diff) | |
merge latest trunk changes
Diffstat (limited to 'indra/cmake')
| -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) |