Skip to content
Snippets Groups Projects
Commit 13c96cc4 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

DEV-19146 / Don't hard-code Windows paths.

parent d0c70d11
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment