Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Appease cmake 3.1.0

Browse Source
This commit is contained in:
Shyotl
2015-01-09 21:38:27 -06:00
parent 2678d0f99e
commit b808caaa0e
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
indra/cmake/DirectX.cmake
View File

@@ -11,25 +11,32 @@ if (WINDOWS)
set (DIRECTX_ARCHITECTURE x86) set (DIRECTX_ARCHITECTURE x86)
endif (WORD_SIZE EQUAL 32) endif (WORD_SIZE EQUAL 32)
SET(program_files $ENV{ProgramW6432})
if(NOT program_files)
SET(program_files $ENV{ProgramFiles})
endif(NOT program_files)
SET(program_files_x86 "ProgramFiles(x86)")
SET(program_files_x86 $ENV{${program_files_x86}})
find_path(DIRECTX_ROOT_DIR Include/dxdiag.h find_path(DIRECTX_ROOT_DIR Include/dxdiag.h
PATHS PATHS
"$ENV{DXSDK_DIR}" "$ENV{DXSDK_DIR}"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)" "${program_files}/Microsoft DirectX SDK (June 2010)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2010)" "${program_files_x86}/Microsoft DirectX SDK (June 2010)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (February 2010)" "${program_files}/Microsoft DirectX SDK (February 2010)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (February 2010)" "${program_files_x86}/Microsoft DirectX SDK (February 2010)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2009)" "${program_files}/Microsoft DirectX SDK (March 2009)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2009)" "${program_files_x86}/Microsoft DirectX SDK (March 2009)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2008)" "${program_files}/Microsoft DirectX SDK (August 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2008)" "${program_files_x86}/Microsoft DirectX SDK (August 2008)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2008)" "${program_files}/Microsoft DirectX SDK (June 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2008)" "${program_files_x86}/Microsoft DirectX SDK (June 2008)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2008)" "${program_files}/Microsoft DirectX SDK (March 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2008)" "${program_files_x86}/Microsoft DirectX SDK (March 2008)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)" "${program_files}/Microsoft DirectX SDK (November 2007)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (November 2007)" "${program_files_x86}/Microsoft DirectX SDK (November 2007)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)" "${program_files}/Microsoft DirectX SDK (August 2007)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2007)" "${program_files_x86}/Microsoft DirectX SDK (August 2007)"
) )
if (DIRECTX_ROOT_DIR) if (DIRECTX_ROOT_DIR)
@@ -38,10 +45,10 @@ if (WINDOWS)
else (DIRECTX_ROOT_DIR) else (DIRECTX_ROOT_DIR)
find_path (WIN_KIT_ROOT_DIR Include/um/windows.h find_path (WIN_KIT_ROOT_DIR Include/um/windows.h
PATHS PATHS
"$ENV{ProgramFiles}/Windows Kits/8.1" "${program_files}/Windows Kits/8.1"
"$ENV{ProgramFiles(x86)}/Windows Kits/8.1" "${program_files_x86}/Windows Kits/8.1"
"$ENV{ProgramFiles}/Windows Kits/8.0" "${program_files}/Windows Kits/8.0"
"$ENV{ProgramFiles(x86)}/Windows Kits/8.0" "${program_files_x86}/Windows Kits/8.0"
) )
find_path (WIN_KIT_LIB_DIR dxguid.lib find_path (WIN_KIT_LIB_DIR dxguid.lib

9
indra/cmake/QuickTimePlugin.cmake
View File

@@ -8,8 +8,13 @@ endif(INSTALL_PROPRIETARY)
if (DARWIN) if (DARWIN)
include(CMakeFindFrameworks) include(CMakeFindFrameworks)
find_library(QUICKTIME_LIBRARY QuickTime) find_library(QUICKTIME_LIBRARY QuickTime)
elseif (WINDOWS AND WORD_SIZE EQUAL 32)
set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK" SET(program_files $ENV{ProgramW6432})
if(NOT program_files)
SET(program_files $ENV{ProgramFiles})
endif(NOT program_files)
set(QUICKTIME_SDK_DIR "${program_files}/QuickTime SDK"
CACHE PATH "Location of the QuickTime SDK.") CACHE PATH "Location of the QuickTime SDK.")
find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient