diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-09-24 00:07:45 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-09-24 00:07:45 +0000 |
| commit | 13c96cc47ba104483fa6a5f2c2c197f7b66fdecf (patch) | |
| tree | c558f65cd9b85b98e046b4269ce7ce6e7f002139 | |
| parent | d0c70d11cb06eaa94900f95c16ae923911b6b565 (diff) | |
DEV-19146 / Don't hard-code Windows paths.
| -rw-r--r-- | indra/cmake/DirectX.cmake | 20 | ||||
| -rw-r--r-- | indra/cmake/FindMono.cmake | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 4d2d5e018a..0f0b0c6ade 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -3,12 +3,12 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" - "C:/Program Files/Microsoft DirectX SDK (June 2008)/Include" - "C:/Program Files/Microsoft DirectX SDK (March 2008)/Include" - "C:/Program Files/Microsoft DirectX SDK (November 2007)/Include" - "C:/Program Files/Microsoft DirectX SDK (August 2007)/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Include" "C:/DX90SDK/Include" - "C:/Program Files/DX90SDK/Include" + "$ENV{PROGRAMFILES}/DX90SDK/Include" ) if (DIRECTX_INCLUDE_DIR) include_directories(${DIRECTX_INCLUDE_DIR}) @@ -22,12 +22,12 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" - "C:/Program Files/Microsoft DirectX SDK (June 2008)/Lib/x86" - "C:/Program Files/Microsoft DirectX SDK (March 2008)/Lib/x86" - "C:/Program Files/Microsoft DirectX SDK (November 2007)/Lib/x86" - "C:/Program Files/Microsoft DirectX SDK (August 2007)/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Lib/x86" "C:/DX90SDK/Lib" - "C:/Program Files/DX90SDK/Lib" + "$ENV{PROGRAMFILES}/DX90SDK/Lib" ) if (DIRECTX_LIBRARY_DIR) if (DIRECTX_FIND_QUIETLY) diff --git a/indra/cmake/FindMono.cmake b/indra/cmake/FindMono.cmake index f0a0705481..c36d7259e8 100644 --- a/indra/cmake/FindMono.cmake +++ b/indra/cmake/FindMono.cmake @@ -14,29 +14,29 @@ # Removed the check for gmcs FIND_PROGRAM (MONO_EXECUTABLE mono - "C:/Program Files/Mono-1.9.1/bin" - "C:/Program Files/Mono-1.2.6/bin" + "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" + "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin ) FIND_PROGRAM (MCS_EXECUTABLE mcs - "C:/Program Files/Mono-1.9.1/bin" - "C:/Program Files/Mono-1.2.6/bin" + "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" + "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin ) FIND_PROGRAM (GMCS_EXECUTABLE gmcs - "C:/Program Files/Mono-1.9.1/bin" - "C:/Program Files/Mono-1.2.6/bin" + "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" + "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin ) FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil - "C:/Program Files/Mono-1.9.1/bin" - "C:/Program Files/Mono-1.2.6/bin" + "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" + "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin @@ -44,7 +44,7 @@ FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil FIND_PROGRAM (ILASM_EXECUTABLE ilasm NO_DEFAULT_PATH - PATHS "C:/Program Files/Mono-1.9.1/bin" "C:/Apps/Mono-1.2.6/bin" "C:/Program Files/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin + PATHS "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin ) SET (MONO_FOUND FALSE) |