kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'windows-program-files' 

09b2f1c3 Windows: Find Program Files directories more robustly from environment
This commit is contained in:
Brad King 2016-01-19 09:35:30 -05:00 committed by CMake Topic Stage
parent 5079cc1243 09b2f1c3f5
commit 2a73530be9
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Modules/Platform/WindowsPaths.cmake
View File

@ -28,46 +28,32 @@ set(__WINDOWS_PATHS_INCLUDED 1)
# Windows 64-bit Binary: # Windows 64-bit Binary:
# ENV{ProgramFiles(x86)} = [C:\Program Files (x86)] # ENV{ProgramFiles(x86)} = [C:\Program Files (x86)]
# ENV{ProgramFiles} = [C:\Program Files] # ENV{ProgramFiles} = [C:\Program Files]
# ENV{ProgramW6432} = <not set> # ENV{ProgramW6432} = [C:\Program Files] or <not set>
# (executed from cygwin):
# ENV{ProgramFiles(x86)} = <not set>
# ENV{ProgramFiles} = [C:\Program Files]
# ENV{ProgramW6432} = <not set>
# #
# Windows 32-bit Binary: # Windows 32-bit Binary on 64-bit Windows:
# ENV{ProgramFiles(x86)} = [C:\Program Files (x86)] # ENV{ProgramFiles(x86)} = [C:\Program Files (x86)]
# ENV{ProgramFiles} = [C:\Program Files (x86)] # ENV{ProgramFiles} = [C:\Program Files (x86)]
# ENV{ProgramW6432} = [C:\Program Files] # ENV{ProgramW6432} = [C:\Program Files]
# (executed from cygwin): set(_programfiles "")
# ENV{ProgramFiles(x86)} = <not set> foreach(v "ProgramW6432" "ProgramFiles" "ProgramFiles(x86)")
# ENV{ProgramFiles} = [C:\Program Files (x86)] if(DEFINED "ENV{${v}}")
# ENV{ProgramW6432} = [C:\Program Files] file(TO_CMAKE_PATH "$ENV{${v}}" _env_programfiles)
if(DEFINED "ENV{ProgramW6432}") list(APPEND _programfiles "${_env_programfiles}")
# 32-bit binary on 64-bit windows. unset(_env_programfiles)
# The 64-bit program files are in ProgramW6432.
list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramW6432}")
# The 32-bit program files are in ProgramFiles.
if(DEFINED "ENV{ProgramFiles}")
list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles}")
endif() endif()
else() endforeach()
# 64-bit binary, or 32-bit binary on 32-bit windows. if(DEFINED "ENV{SystemDrive}")
if(DEFINED "ENV{ProgramFiles}") foreach(d "Program Files" "Program Files (x86)")
list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles}") if(EXISTS "$ENV{SystemDrive}/${d}")
endif() list(APPEND _programfiles "$ENV{SystemDrive}/${d}")
set(programfilesx86 "ProgramFiles(x86)")
if(DEFINED "ENV{${programfilesx86}}")
# 64-bit binary. 32-bit program files are in ProgramFiles(x86).
list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{${programfilesx86}}")
elseif(DEFINED "ENV{SystemDrive}")
# Guess the 32-bit program files location.
if(EXISTS "$ENV{SystemDrive}/Program Files (x86)")
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
"$ENV{SystemDrive}/Program Files (x86)")
endif() endif()
endif() endforeach()
endif() endif()
if(_programfiles)
list(REMOVE_DUPLICATES _programfiles)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_programfiles})
endif()
unset(_programfiles)
# Add the CMake install location. # Add the CMake install location.
get_filename_component(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) get_filename_component(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)